Bug 1096653, fix hg-share clobbers of gaia-central, r=catlee
Merge default --> production

--HG--
branch : production