[6.2.1] Cherry-pick: Fix traits .when(traits:) condition; pre-computation when loading dependency manifests#9141

bripeticca merged 2 commits intoswiftlang:release/6.2.1swiftlang/swift-package-manager:release/6.2.1from

bripeticca:bp/6.2.1bripeticca/swift-package-manager:bp/6.2.1Copy head branch name to clipboard