2.2: Merged revision 1506594 (JCR-3630)

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