Merge changes I71b34181,Ibd05137a

* changes:
  init: Document the locking strategy used in class PropWaiterState
  init: Document the locking strategy in class ShutdownState