2.6: Merged revisions 1480574,1481964,1484440,1484442,1484444 (JCR-3534)

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