Dev 2014.09.23

r? @oremj 
excluded commit https://github.com/mozilla-services/svcops-puppet/commit/1ad5841b372aa1d5dcb9d5c8d0d6b90991dcef98