Merge "Consolidate resource locking with state changes"
tree: 6349bcb56e2f3d1453082fe47ff78d3403fa50ce
  1. api/
  2. common/
  3. functional/
  4. scenario/