1.0: Merged revisions 1589488 and 1589794 (OAK-1767)

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