new style for 2.7
Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp