Merge branch 'candidate-6.4.2'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

system/jlib/jstats.cpp

@@ -971,11 +971,11 @@ public:
         in.read(value);
     }
 
-    virtual StatisticKind queryKind() const
+    StatisticKind queryKind() const
     {
         return kind;
     }
-    virtual unsigned __int64 queryValue() const
+    unsigned __int64 queryValue() const
     {
         return value;
     }