Merge pull request #6401 from phadej/backport-batch-2

.dockerignore

.travis.yml

Cabal/Cabal.cabal

Cabal/tests/CheckTests.hs

Cabal/tests/ParserTests.hs

Makefile

cabal-install/Distribution/Client/CmdBuild.hs

cabal-install/Distribution/Client/CmdSdist.hs

cabal-install/Distribution/Client/Compat/FileLock.hsc

cabal-install/Distribution/Client/GZipUtils.hs

cabal-install/Distribution/Client/Security/HTTP.hs

cabal-install/Distribution/Client/Store.hs

cabal-install/bootstrap.sh

cabal-install/cabal-install.cabal

cabal-install/cabal-install.cabal.pp

...-install/tests/UnitTests/Distribution/Client/GZipUtils.hs

cabal-testsuite/Test/Cabal/Monad.hs

cabal-testsuite/Test/Cabal/OutputNormalizer.hs

cabal-testsuite/Test/Cabal/Prelude.hs

cabal-testsuite/cabal-testsuite.cabal