Merge pull request #7 from apache/issues/SLING-11506

SLING-11506 : Streamline and document resource (super) type merging