Merge branch '3.3.x' into 3.4.x

Closes gh-44060

Author: wilkinsona

.github/workflows/ci.yml

@@ -30,6 +30,8 @@ jobs:
               name: Linux
             java:
               version: 17
+          - os:
+              name: ${{ github.repository == 'spring-projects/spring-boot-commercial' && 'Windows' }}
     steps:
       - name: Prepare Windows runner
         if: ${{ runner.os == 'Windows' }}