2016-05-03 - production
16:17	<bblack>	merging https://gerrit.wikimedia.org/r/285086 for puppetswat (apache redirects change)	[production]