HCOLL-231 Use only write locking while we solve a concurrency issue.
Merge remote-tracking branch 'origin/master'