merge r1643111 (OAK-2317)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1644415 13f79535-47bb-0310-9956-ffa450edef68
OAK-2336: NodeDocument.getNodeAtRevision() may read too many revisions

Merged revision 1644407 from trunk with some changes from OAK-1794 (1608731)

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