Bug 1083464 - Fix some uncaught merge bustage from the initial backport; r=sfink a=bkerensa

--HG--
extra : amend_source : 1c64ae13097a13d4e3cf34ddf9c2c0d1a8353c34