2.6: Merged revisions 1566668 and 1566669 (JCR-3721)

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