1.0: Merged revisions 1587485 and 1587580 (OAK-1731)

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