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

Merged by openshift-bot