Bug 926932 - Merge the tests in test_clock_create_new_alarm.py
Bug 926920 - Merge the two tests in test_clock_switch_clock_type.py
Merge pull request #13321 from bobsilverberg/v1.2clock

Bug 934220 - [v1.2] Update clock app and tests to be in line with master
Bug 929999 - Bump marionette_client dependency to 0.6.1 or above

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