2.6: Merged revision 1519376 (JCR-3658)

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