Add a wait to bolster alarm tests

Conflicts:
	gaiatest/apps/clock/regions/alarm.py
fix tap on contact issue
remove delete_all_alarms from v1-train
Merge pull request #1205 from zacc/nit_align_v1_to_master

Nit align v1 to master