JCRVLT-25 Implement AccessControllHandling MERGE and MERGE_PRESERVE

- use latest oak

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