Merge puppet-module_skel