bug 932491 - Address intermittent errors in test_clock_set_alarm_snooze.py

Uplifting to v1.2

I ran all affected tests and they all pass.

Best to wait to see what Travis thinks of this as well.