JCR-3782 (merge changes made with rev. 1597799)

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