Bug 793925: part 4 - move test-url related to packed/unpacked addons to dedicated test addon
Bug 793925: part 5 - Move test-layout-change to a test addon, so that it will be executed exactly like a regular addon.
Merge pull request #798 from ochameau/test-url

Bug 793925: part 4 - move test-url related to packed/unpacked addons to dedicated test addon r=@gozala
Merge pull request #799 from ochameau/test-layout

Bug 793925: part 5 - Move test-layout-change to a test addon, so that it will be executed exactly like a regular addon. r=@gozala
Merge remote-tracking branch 'upstream/master' into use-mc-modules

Conflicts:
	test/addons/layout-change/main.js
	test/test-url.js
Move commonjs path overload from loader to bootstrap.