Merge "orchestration convert API test Timeouts to respect build_timeout"