Merge "Maven archetype for config subsystem aware bundles"