You don’t need to cherry-pick the followup to simplify the

travis_docker

image (https://github.com/pantsbuild/pants/pull/7505), only #7064