Automatic merge of jdk:master into master

Author: duke

make/hotspot/ide/CreateVSProject.gmk

@@ -35,8 +35,8 @@ ifeq ($(call isTargetOs, windows), true)
   # The next part is a bit hacky. We include the CompileJvm.gmk to be
   # able to extact flags, but we do not wish to execute the rules.
 
-  # Use client as base for defines and includes
-  JVM_VARIANT=client
+  # Use server as base for defines and includes
+  JVM_VARIANT=server
 
   include HotspotCommon.gmk
   include lib/CompileJvm.gmk