Backport "Fix expandParam's use of argForParam/isArgPrefixOf."#19491

Merged

Kordyjan merged 2 commits intorelease-3.3.2from

Jan 31, 2024

Commits on Jan 31, 2024

Fix expandParam's use of argForParam/isArgPrefixOf.

dwijnand
authored and
Kordyjan
committed
Remove an incompatible java api method in java 8 from a test

jchyb
authored and
Kordyjan
committed