Merge branch 'prevent_pants_bootstrap_failure_on_BadStatusLine' into prevent_pants_bootstrap_failure_on_BadStatusLine_with_travis_pants_bootstrap