Merge pull request #6403 from phadej/backport-3.0-batch-3

Cabal/Cabal.cabal

Cabal/Distribution/PackageDescription/Quirks.hs

Cabal/Distribution/Types/Dependency.hs

Cabal/Distribution/Types/Version.hs

Cabal/tests/ParserTests.hs

Cabal/tests/ParserTests/errors/big-version.cabal

Cabal/tests/ParserTests/errors/big-version.errors

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

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

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

Cabal/tests/ParserTests/regressions/issue-5846.cabal

Cabal/tests/ParserTests/regressions/issue-5846.expr

Cabal/tests/ParserTests/regressions/issue-5846.format

Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal

Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr

...l/tests/ParserTests/regressions/issue-6083-pkg-pkg.format