OAK-2294: Corrupt repository after concurrent version operations
Merging revisions 1641950, 1642667, 1642954, 1642959

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1643122 13f79535-47bb-0310-9956-ffa450edef68