Bug 994176 - Create branched versions of marionette-client and consumer packages. r=mdas a=test-only
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/491d64065881
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 994176 - Create branched versions of marionette-client and consumer packages. r=bsilverberg

========

https://hg.mozilla.org/integration/gaia-1_3/rev/9a9181a05211
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 979253 - Remove deprecated LockScren class from gaiatest

========

https://hg.mozilla.org/integration/gaia-1_3/rev/25a646065f86
Author: Sasha Kruglov <sashakruglov@hotmail.com>
Desc: Bug 946652 - Merge LockScreen class into GaiaDevice class; r=zacc

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/gcli.py
	tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_wake_with_notification.py

========

https://hg.mozilla.org/integration/gaia-1_3/rev/12e06d087697
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Use milliseconds for script timeout. a=test-only

========

https://hg.mozilla.org/integration/gaia-1_3/rev/c9853b8211b5
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 979248 - Fix default timeout in start_b2g method

========

https://hg.mozilla.org/integration/gaia-1_3/rev/95b8af24badd
Author: rwood-moz <rwood@mozilla.com>
Desc: Bug 964280 - Add option to override b2g start timeout duration. r=dhunt
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Merge b2g28 to v1.3t. a=merge