Bug 1014831: puppetize.sh checks/retries fqdn; r=dustin
Merge default -> production

--HG--
branch : production