Bug 981107: check exit codes more carefully in puppetize.sh; r=arich
Bug 999661: disable upstream syncs to relabs temporarily; a=orgonly
Merge default -> production

--HG--
branch : production