bug 1036658 - shorten test timeout unless on CI
Bug 1040432 - Move sdk/system/xul-app to a jsm so that cuddlefish/toolkit loaders can access it easily. r=Mossop
bug 1041844 - disable e10s tests on aurora, beta
Merge pull request #1559 from zombie/1036658-short-timeout

bug 1036658 - shorten test timeout unless on CI, r=@Mossop
Merge pull request #1560 from zombie/1041844-e10s-beta

bug 1041844 - disable e10s tests on aurora, beta, r=@erikvold
Bug 1038381 - Replace usage of @test/options with sdk/test/options
Merge pull request #1563 from erikvold/1038381

Bug 1038381 - Replace usage of @test/options with sdk/test/options r=@gozala