Bug 964280 - Add option to override b2g start timeout duration. r=dhunt
Bug 979248 - Fix default timeout in start_b2g method
Use milliseconds for script timeout. a=test-only
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
Bug 979253 - Remove deprecated LockScren class from gaiatest
Bug 994176 - Create branched versions of marionette-client and consumer packages. r=bsilverberg