OAK-1419: Improve concurrent merge handling

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