Bug 932430: Fix travis by cherry-picking lazy_loader.js changes from 96da5a1bad1
Merge pull request #13195 from wanderview/shared-lazyloader-v1.2

Bug 932430: Fix travis by cherry-picking lazy_loader.js changes from 96d...
Bug 916730 - Intermittent integration test failure "notification tests email notification should not wake screen"
Merge pull request #13201 from mikehenrty/fix-1.2

Bug 916730 - Intermittent integration test failure "notification tests e...
Bug 932542 - vbump marionette apps to 0.3.1 +shepherd
Disable calendar create event integration test
Merge pull request #13202 from lightsofapollo/v1.2-fix-app-clos

Bug 932542 - vbump marionette apps to 0.3.1 +shepherd
Bug 917044 - Run gjslint, unit tests and integration tests in parallel
Merge pull request #13204 from lightsofapollo/enable-parallel-v1.2

Bug 917044 - Run gjslint, unit tests and integration tests in parallel
Bug 916305 - Gaia ui test travis setup
Bug 928631: support sym linked b2g in gaia-ui-test
Merge pull request #13205 from lightsofapollo/v1.2-gaia-ui-tests-travis

V1.2 gaia ui tests travis
Bug 927642 - Fix dir/lang integration tests for notifications
Merge pull request #13103 from davidflanagan/bug923544

Bug 923544: remove unneeded workaround that was causing problems r=aus(cherry picked from commit 8db3fca246d8ba79a8bdd9998f5e12ed11533fea)

Conflicts:

	apps/settings/js/sound.js
Merge pull request #13235 from davidflanagan/bug923544-v1.2

Merge pull request #13103 from davidflanagan/bug923544
Merge pull request #12949 from qdot/927642-1.2-more-tests

Bug 927642 - Readd integration tests for notification lang/direction in gaia