WIP log error when restricted manifests and environment.conf manifest

conflict
(WIP) spec tests
Merge branch 'feature/master/pup-3069-add-defaultmanifest' of https://github.com/jpartlow/puppet into feature/master/pup-3069-add-defaultmanifest

Conflicts:
	spec/unit/settings/environment_conf_spec.rb