Merge "Add higher timeout for Jenkins behind Haproxy."