Merge "Increase connection_max_retries to 480 secs on CentOS jobs"