OAK-1577: Implement refined conflict resolution for addExistingNode conflicts
 
 - fixed issue
 - adapted test case
 - committed batch

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