1.0.2: Merged revisions 1607077, 1607185, 1607196, 1607526, 1607664 and 1608560 (OAK-1927, OAK-1932)

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