2016-07-20 - releng
10:26	<hashar>	beta: rebased puppetmaster git repo. "Parsoid: Move to service::node" has weird conflict https://gerrit.wikimedia.org/r/#/c/298436/	[releng]