2016-07-21 - releng
00:12	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/299825/ to deployment-puppetmaster so wdqs nginx log parsing can be tested	[releng]