Fixed typo in ServerConfig.jvmArg
Merge origin/master