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

Corrected to not use @suffix
Merge default -> production

--HG--
branch : production