OAK-1316 : AnnotatingConflictHandler does not set primary type of rep:ours nodes

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