2.6: Merged revision 1461646 (JCR-3550)

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