Merge "Check start time for wait_time key" into feature/zuulv3