Make HAProxy default timeout match router default timeout
Merge git://github.com/cloudfoundry/cf-release