OAK-1794 - Keep commit info for local changes in main document

Merging 1607557,1608731


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