Update TestVMOptionsFile.java to match fix for 8135195; other minor cleanups. Reviewed-by: dcubed, rdurbin
Reviewed-by: dcubed, gtriantafill, rdurbin