Bug 793925: part 7 - move sdk/test to test so that we can do require(test) without magic.
Merge pull request #803 from ochameau/793925-part7

Bug 793925: part 7 - move sdk/test to test so that we can do require(test) without magic. r=@gozala
Merge remote-tracking branch 'upstream/master' into use-mc-modules

Conflicts:
	app-extension/bootstrap.js