Use $module_name in template calls to ease module renaming
Use $module_name in template calls to ease module renaming
Merge branch 'rename-apache-to-apache_c2c' into merge_branch

Conflicts:
	manifests/base.pp
	manifests/vhost.pp