Expose nickname option in ::node. Keep current default.
Merge branch 'master' into general-improvements

Conflicts:
	manifests/init.pp