No bug: re-enable upstream sync to relabs; a=orgonly
Merge default -> production

--HG--
branch : production