Merge branch 'feature/SLING-10245-add-jcr-primary-type' into master