OAK-2345: Diff reads too many nodes

Merged revision 1644650 and 1644654 from trunk

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