Merge pull request #7136 from phadej/backport-to-3.4-20201027

Cabal/Cabal.cabal

Cabal/Distribution/PackageDescription/Check.hs

Cabal/Distribution/PackageDescription/FieldGrammar.hs

Cabal/Distribution/Types/PackageDescription.hs

Cabal/Distribution/Utils/Generic.hs

Cabal/tests/CheckTests.hs

Cabal/tests/ParserTests/regressions/Octree-0.5.expr

Cabal/tests/ParserTests/regressions/anynone.expr

Cabal/tests/ParserTests/regressions/big-version.expr

Cabal/tests/ParserTests/regressions/common-conditional.expr

Cabal/tests/ParserTests/regressions/common.expr

Cabal/tests/ParserTests/regressions/common2.expr

Cabal/tests/ParserTests/regressions/common3.expr

Cabal/tests/ParserTests/regressions/denormalised-paths.cabal

Cabal/tests/ParserTests/regressions/denormalised-paths.check

Cabal/tests/ParserTests/regressions/elif.expr

Cabal/tests/ParserTests/regressions/elif2.expr

Cabal/tests/ParserTests/regressions/encoding-0.8.expr

Cabal/tests/ParserTests/regressions/generics-sop.expr

Cabal/tests/ParserTests/regressions/hasktorch.expr