2.6: Merged revisions 1539030, -45, and -50 (JCR-3691)

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