add support for 4.2.0 puppet modules.

M
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Capfile
	recipe.rb
update network config
split configuration steps