OAK-1967: Avoid collision marker update when already present

Merge revision 1610489 from trunk

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