fix composite*.xml files for consistency w/ other non-generated ones, and make sure that the compositeContent.xml file is of type compositeMetadataRepository, not compositeArtifactRepository >> master