Automatic merge of jdk:master into master

Author: duke

test/hotspot/jtreg/runtime/logging/RedefineClasses.java

@@ -31,7 +31,7 @@
  *          java.instrument
  * @requires vm.jvmti
  * @run main RedefineClassHelper
- * @run main/othervm -Xmx256m -XX:MaxMetaspaceSize=64m -javaagent:redefineagent.jar -XX:+Verbose -Xlog:all=trace:file=all.log RedefineClasses
+ * @run main/othervm -Xmx256m -XX:MaxMetaspaceSize=64m -javaagent:redefineagent.jar -Xlog:all=trace:file=all.log RedefineClasses
  */
 
 // package access top-level class to avoid problem with RedefineClassHelper