JCR-3585: Merge/update does not skip simpleVersionable content

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