Backport intermittent test fixes to firefox25

Very few conflicts here, only test-firefox-tabs needed some tweaking as the entire test got switched to the new style after one test got removed in master. Looking all green on try.