Automatic merge from submit-queue (batch tested with PRs 34488, 39511, 39619, 38342, 39491) Make StrategicPatch delete all matching maps in a merging list fixes #38332 ```release-note NONE ``` cc: @lavalamp @pwittrock
Automatic merge from submit-queue (batch tested with PRs 34488, 39511, 39619, 38342, 39491) Make StrategicPatch delete all matching maps in a merging list fixes #38332 ```release-note NONE ``` cc: @lavalamp @pwittrock