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
Wait for the call log upgrade progress bar to complete
Make the testvars argument optional
Bump version number to 0.13
Merge remote-tracking branch 'upstream/v1-train' into v1-train
migrate base.py to marionette.By
migrate gaia_test.py to marionette.By
migrate Language to marionette.By
Unlock screen when a passcode is set

Conflicts:
	gaiatest/tests/lockscreen/manifest.ini