Fix silly typo in passwords.py.template. r=bustage
Merge typo fix from default.
Another bustage fix for signing servers.
Merge bustage fix.
Bug 1052192: use /usr/local/bin/hg for puppetmasters; r=dividehex
Bug 1050513: disable ReportPanicService where it exists; r=bhearsum
Bug 1050513: enforce administrator account (with root pw) on Mavericks; r=bhearsum
Bug 1050513: depend on Darwinuser for old OS X and User for new; r=bhearsum
Bug 1050513: require collectd be installed before starting service; r=bhearsum
Bug 1050513: actually start the puppet service; r=bhearsum
Merge default -> production