JCR-3782 : Backport OAK-1612, OAK-1615, OAK-1616

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