Merge "Increase wait_timeout for Jenkins master"