JCR-3840 take same-name child type definitions into account when reregistering node types

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