SLING-3622 : support changing jcr:primaryType from/to nt:folder

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