Merge "Extend test timeout to 120s" into feature/zuulv3