1.0.2: Merged revision 1608783 (OAK-1932)

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