OAK-846: Branch conflicts not detected by MongoMK
- Adding ignored test

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1486944 13f79535-47bb-0310-9956-ffa450edef68
OAK-527: permissions (wip)

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