Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/jpf-core

diff --combined main.jpf
index 5d32e0bc041c9b53ed7034c49bd8a57a348655ed,e1ac21cedd88afce006dc3def74ba1d519055a91..713b4db5a3a6efcec8bc9c5fbc9e17099ef20c7f
--- 1/main.jpf
--- 2/main.jpf
+++ b/main.jpf
@@@ -6,8 -6,7 +6,8 @@@ target = mai
  #listener=gov.nasa.jpf.listener.StateReducerOld
  #listener=gov.nasa.jpf.listener.VariableConflictTracker,gov.nasa.jpf.listener.StateReducer
  #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducer
 -listener=gov.nasa.jpf.listener.ConflictTracker
 +listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducerSimple
 +#listener=gov.nasa.jpf.listener.ConflictTracker
  
  #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducerClean
  #listener=gov.nasa.jpf.listener.StateReducerClean
@@@ -17,7 -16,7 +17,7 @@@
  # Alarms
  #variables=currentAlarm
  # Locks
- variables=currentLock
+ variables=lock
  # Thermostats
  #variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
  # Switches