2021-03-30 - releng
14:50	<Majavah>	cherry pick 675807 675814 and 675815 to deployment-puppetmaster to unblock work on deployment-deploy03 until sre has merged those T278689	[releng]