dependency fixes to get maestro-puppet-examples properly building again: new puppet version, maestrodev/maestro_nodes, ...
Merge branch 'master' into development

Conflicts:
	Puppetfile
	Puppetfile.lock