Winsock 2 provided by ws2_32.lib is available since 1994, it should be fine to use it even for wx in 2021. See #15562.
Merge with the latest master in preparation for merging into master. Rebake to resolve conflicts in generated files.