1.0.1: Merged revisions 1602256 and 1602261 (OAK-1804)

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