--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options	Wed Mar 30 21:05:35 2016 +0900
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options	Fri Apr 01 14:29:41 2016 -0700
@@ -255,24 +255,8 @@
     format "0.000"
   }
   column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align center
-    width 5
-    scale raw
-    format "0"
-  }
-  column {
-    header "^CGCT^"	/* Concurrent Garbage Collection Time (STW phase) */
-    data sun.gc.collector.2.time/sun.os.hrt.frequency
-    align right
-    width 8
-    scale sec
-    format "0.000"
-  }
-  column {
     header "^GCT^"	/* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
@@ -424,14 +408,6 @@
     scale raw
     format "0"
   }
-  column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align right
-    width 5
-    scale raw
-    format "0"
-  }
 }
 
 option gccause {
@@ -515,24 +491,8 @@
     format "0.000"
   }
   column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align right
-    width 5
-    scale raw
-    format "0"
-  }
-  column {
-    header "^CGCT^"	/* Concurrent Garbage Collection Time (STW phase) */
-    data sun.gc.collector.2.time/sun.os.hrt.frequency
-    align right
-    width 8
-    scale sec
-    format "0.000"
-  }
-  column {
     header "^GCT^"	/* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
@@ -730,14 +690,6 @@
     scale raw
     format "0"
   }
-  column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align right
-    width 5
-    scale raw
-    format "0"
-  }
 }
 
 option gcold {
@@ -813,24 +765,8 @@
     format "0.000"
   }
   column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align right
-    width 5
-    scale raw
-    format "0"
-  }
-  column {
-    header "^CGCT^"	/* Concurrent Garbage Collection Time (STW phase) */
-    data sun.gc.collector.2.time/sun.os.hrt.frequency
-    align right
-    width 8
-    scale sec
-    format "0.000"
-  }
-  column {
     header "^GCT^"	/* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
@@ -895,24 +831,8 @@
     format "0.000"
   }
   column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align right
-    width 5
-    scale raw
-    format "0"
-  }
-  column {
-    header "^CGCT^"	/* Concurrent Garbage Collection Time (STW phase) */
-    data sun.gc.collector.2.time/sun.os.hrt.frequency
-    align right
-    width 8
-    scale sec
-    format "0.000"
-  }
-  column {
     header "^GCT^"	/* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
@@ -993,24 +913,8 @@
     format "0.000"
   }
   column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align right
-    width 5
-    scale raw
-    format "0"
-  }
-  column {
-    header "^CGCT^"	/* Concurrent Garbage Collection Time (STW phase) */
-    data sun.gc.collector.2.time/sun.os.hrt.frequency
-    align right
-    width 8
-    scale sec
-    format "0.000"
-  }
-  column {
     header "^GCT^"	/* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec
@@ -1099,24 +1003,8 @@
     format "0.000"
   }
   column {
-    header "^CGC^"	/* Concurrent Collections (STW phase) */
-    data sun.gc.collector.2.invocations
-    align right
-    width 5
-    scale raw
-    format "0"
-  }
-  column {
-    header "^CGCT^"	/* Concurrent Garbage Collection Time (STW phase) */
-    data sun.gc.collector.2.time/sun.os.hrt.frequency
-    align right
-    width 8
-    scale sec
-    format "0.000"
-  }
-  column {
     header "^GCT^"	/* Total Garbage Collection Time */
-    data (sun.gc.collector.0.time + sun.gc.collector.1.time + sun.gc.collector.2.time)/sun.os.hrt.frequency
+    data (sun.gc.collector.0.time + sun.gc.collector.1.time)/sun.os.hrt.frequency
     align right
     width 8
     scale sec