Attempt #2 to hack around the winsock.h problem

Refs #7769
Merge branch 'feature/7769_NewRemoteAPI' into develop