Merge "Fix race in test_periodic_override" into feature/zuulv3