2.6: Merged revision 1437963, 1438158 and 1439797 (JCR-1873)

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