Miscellaneous e10s fixes

I think changing the license of the file should be explained in the commit. changing license under the covers of "misc fixes" is dubious. I have read the bugzilla where the license change was discussed and it should be referenced.