Revert "Bug 911270 - fix up variable warnings from puppetmasters; r=dustin"
Merge default -> production

--HG--
branch : production