1.x: Merged revisions 801968 and 801973 (JCR-442)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/1.x@801983 13f79535-47bb-0310-9956-ffa450edef68
4 files changed