SLING-3639 : on primaryType change, merge child properties with parent to get rid of a unnecessary .content.xml

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