Bug 853461 - GC: A couple more rooting hazards r=terrence

--HG--
extra : rebase_source : da4c0acc97603cf3eb8b263d9c99166660bc1524