Bug 946872: disable upstream syncing in relabs, so I can resync puppetlabs' repos there; a=orgonly
Merge default -> production

--HG--
branch : production