Merge changes Ia8e73bea,Id50f54e8,Icf39d70c,I159d325b

* changes:
  Remove use of locks (5/n)
  Rewrite some methods using waitForResult (4/n)
  Rewrite expireRollbackForPackage (3/n)
  Add thread assertions (2/n)