CQ5 archetype changes for code validation
Merge branch 'master' of https://github.com/photon-infotech/archetypes