bug 1095012 - explicitly disable e10s when not desired
Bug 1092882 - preferences/service should utilize Preferences.jsm
Merge pull request #1702 from zombie/1095012-ci-e10s

bug 1095012 - explicitly disable e10s when not enabled for testing, r=@Mossop
Merge pull request #1704 from erikvold/1092882

Bug 1092882 - preferences/service should utilize Preferences.jsm r=@jsantell
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 1095583

Conflicts:
	lib/sdk/test/assert.js