No Bug - Fix merge bustage impacting GGC builds; r=Waldo

--HG--
extra : rebase_source : 8933560f048763af305c6a530f61a97708b90d59