[v1-train] Specific patch to add email wait functionality, matches the code in v1.0.1
Merge pull request #916 from zacc/email_scroll_and_wait

[v1-train] Email scroll and wait patch
Tap on the bottom of the Next button when setting up email account to address intermittent failure
Unxfail videoplayer tests due to resolution of bug 877359
Merge pull request #925 from zacc/unxfail_vid_tests_bug_877359

Unxfail videoplayer tests due to resolution of bug 877359
Fix JS error in GaiaDataLayer.deleteAllSms()
Remove code which is no longer necessary with --restart option
Merge remote-tracking branch 'upstream/master'