bug 833524 - back out f3c2cc8dc47d.
Bug: none; clean out relabs node definitions; a=nodechange
Bug 829856: make the puppet startup type a parameter; r=rail

Then the standalone puppetmaster uses type 'none', and installs a
separate update crontask.
Revert "Bug 829856: make the puppet startup type a parameter; r=rail"

This reverts commit 908032a05baec353831f3e97d215dbe365f2a45b.
Merge branch 'master' of https://github.com/mozilla/build-puppet into 803823