2016-11-11 - releng
23:44	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/320441/ for testing on deployment-logstash2	[releng]