Issue #3321781: Rector fixes

Merged quietone requested to merge issue/commerce_migrate-3321781:3321781-rector-fixes into 3.2.x

Merge request reports