[Win32] Simplify and clean up Pattern #3513

Job	Run time
check-javadoc-consistency	1m 7s
check-merge-commits / Block Merge Commits	11s
check-versions / Check and increment service versions	1m 26s
check-freeze-period / verify-freeze-period	3s
	2m 47s

Provide feedback