Bug 911270 - fix up warnings from puppetmasters; r=dustin