Redo https://github.com/travis-ci/travis-build/pull/298

While the corresponding cookbooks change should be deployed,
we continue to receive reports of
https://github.com/travis-ci/travis-ci/issues/2514.

The PR bit to travis-build was missed during the sexp refactoring,
so we redo it with this commit.
Merge pull request #348 from travis-ci/ha-bug-gh-2514-redux

Redo https://github.com/travis-ci/travis-build/pull/298