locking fixes and adjustments
add update in progress mechanism
fixup tests
Merge pull request #2467 from danmcp/master

Merged by openshift-bot
Merge pull request #2468 from abhgupta/abhgupta-dev

Merged by openshift-bot
Fix platform-scalable-snapshot.feature
Merge pull request #2472 from pmorie/dev/fix_tests

Merged by openshift-bot