CSPACE-6273: Bring over additional code blocks from the main site.pp file into the cspace_environment module.
Merge branch 'master' of github.com:cspace-puppet/cspace_environment

Conflicts:
	manifests/init.pp
CSPACE-6273: Commented out platform-specific contents in init.pp until we can run these sensibly.