OAK-1967: Avoid collision marker update when already present

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