snooze 2.2.0 compatibility.

M
Merge branch 'master' into experimental

Conflicts:
	modules/snoozenode/manifests/init.pp
	modules/snoozenode/templates/snooze_node.cfg.erb
add different version of the config file.

M