Have manual JVM args override default ones, backport #1628