This is a follow-up fix for issues pointed out in the code review for JDK-8085822. Since that changeset went into verona/stage, the problems pointed out by the code review should be resolved in verona/stage before pushing to mainline.

Alan Bateman:
Version.java.template - the comment in jvmSecurityVersion() still talks about 1.6 and newer. Can this be replaced to just say that it returns the security version?

Daniel D. Daugherty:
jdk/src/java.base/share/classes/sun/misc/Version.java.template
    L149: * Returns the security version of the running JVM if it's 1.6 or newer
        This JavaDoc update is wrong, but it might not be important
        if sun.misc.Version class is going away.

David Holmes:
jdk/src/java.base/share/classes/sun/misc/Version.java.template
  This comment is nonsensical:
      /**
! * Returns the security version of the running JVM if it's 1.6 or newer
       * or any RE VM build. It will return 0 if it's an internal 1.5 or
       * 1.4.x build.
       * @since 1.6
       */
  as security version does not exist pre 9. Normally you should be adding a new method and deprecating the old one. The new one is @since 9.

     /**
! * Returns the security version of the running JDK.
       * @since 1.6
       */
  Ditto: @since 9 (but again old should be deprecated and new method added)

 253 /**
 254 * Returns the build number of the running JDK if it's a RE build
 255 * It will return 0 if it's an internal build.
  As with jvm.h this seems obsolete commentary these days - not only RE builds define a build number.