Bug 981361 Fix intermittent timing failures for throttle tests
Merge pull request #1433 from jsantell/981361-fix-throttle-tests-part2

Bug 981361 Fix intermittent timing failures for throttle tests