2018-07-04 - releng
05:31	<Krinkle>	Fix beta-scap-eqiad by cherry-picking https://gerrit.wikimedia.org/r/#/c/operations/puppet/+/443767/ T192996	[releng]