Bug 1111118 - Enable the e10s test add-on in the travis test suite
Merge branch 'master' into 1111118

Conflicts:
	bin/node-scripts/test.addons.js
Merge pull request #1754 from erikvold/1111118

Bug 1111118 - Enable the e10s test add-on in the travis test suite a=me