2018-11-19 - releng
15:53	<Amir1>	cherry-picking gerrit:474694/1 in beta puppetmaster	[releng]