Miscellaneous e10s fixes

Here you go -- reference to the license-to-license-change:

https://bugzilla.mozilla.org/show_bug.cgi?id=942707#c99