Bug 1046877: backing out bustage; a=bustage
Merge default -> production

--HG--
branch : production