Bug 860994 - Fixup intermittent context menu failing tests

--HG--
extra : rebase_source : f577ee38b6e22398b4a8a160cd18dcfcfd3d3169