JCR-3789 (merge changes made with rev. 1603769)

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