Bug 973302 - Address intermittents in test_clock_* tests
Merge pull request #21025 from zacc/bug_973302

Bug 973302