2016-02-09 - releng
11:20 <legoktm> cherry-picked https://gerrit.wikimedia.org/r/#/c/269370/ on integration-puppetmaster [releng]