Resolve backporting conflicts

Cabal/src/Distribution/Simple/Configure.hs

Cabal/src/Distribution/Simple/ConfigureScript.hs

Cabal/src/Distribution/Simple/GHC.hs

Cabal/src/Distribution/Simple/GHCJS.hs

Cabal/src/Distribution/Simple/Program/Db.hs

Cabal/src/Distribution/Simple/Program/Find.hs

Cabal/src/Distribution/Simple/Program/GHC.hs

Cabal/src/Distribution/Simple/Program/Run.hs

Cabal/src/Distribution/Simple/Program/Types.hs

cabal-install/src/Distribution/Client/CmdExec.hs

cabal-install/src/Distribution/Client/CmdInstall.hs

cabal-install/src/Distribution/Client/CmdRun.hs

cabal-install/src/Distribution/Client/Config.hs

cabal-install/src/Distribution/Client/Get.hs

cabal-install/src/Distribution/Client/HttpUtils.hs

cabal-install/src/Distribution/Client/ProjectConfig.hs

...l-install/src/Distribution/Client/ProjectOrchestration.hs

cabal-install/src/Distribution/Client/ProjectPlanning.hs

cabal-install/src/Distribution/Client/SetupWrapper.hs

cabal-install/src/Distribution/Client/VCS.hs