BS-9894 : fix archetype creation
BS-9894 : fix archetype creationto community
Merge branch '6.3.x' into 'MasterBugFixing'