OAK-2151: DocumentNodeStore does not detect hierarchy conflict

Merged revision 1628262,1628447,1628608 from trunk

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