OAK-2020: NodeState view at given version is not stable with DocumentNodeStore

Merge revisions 1616719 and 1618613 from trunk

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