wip
Merge pull request #16565 from bebef1987/test_clock

Bug 971640 - Intermittents in all clock tests