Bug 927002 pin marionette python client to >= 0.6.0
Merge pull request #12462 from dwi2/bug911010

Bug 911010 - [B2G][Helix][dialer][tongxiao]The emergency call Interface ... r=rik
(cherry picked from commit c3bb0282f306cfbb4112aedb835d676f4a965127)
Merge pull request #12899 from zacc/bug927002_v1.2

[v1.2] Bug 927002 pin marionette python client to >= 0.6.0
Bug 927404 - Fix reporting for failed gaiatest tests, r=dhunt, a=test-only

Conflicts:
	tests/python/gaia-ui-tests/setup.py