SAL
Prod
RelEng
Firehose
Other
2015-07-29 -
releng
14:28
<bblack>
cherry-picked
https://gerrit.wikimedia.org/r/#/c/215624
into deployment-puppetmaster ops/puppet
[releng]