chore: backporting changes to merge-forward job from v2 branch#12482

mergify[bot] merged 1 commit intomasteraws/aws-cdk:masterfrom

njlynch/backport-merge-forward-fixaws/aws-cdk:njlynch/backport-merge-forward-fixCopy head branch name to clipboard