Merge remote-tracking branch 'origin/candidate-3.10.2' into candidate-3.10.x

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

system/jlib/javahash.tpp

@@ -33,7 +33,7 @@ void JavaHashTableOf<ELEMENT>::onRemove(void * et)
 template <class ELEMENT>
 bool JavaHashTableOf<ELEMENT>::addOwn(ELEMENT & donor)
 {
-    if(add(donor))
+    if(this->add(donor))
     {
         donor.Release();
         return true;
@@ -44,7 +44,7 @@ bool JavaHashTableOf<ELEMENT>::addOwn(ELEMENT & donor)
 template <class ELEMENT>
 bool JavaHashTableOf<ELEMENT>::replaceOwn(ELEMENT & donor)
 {
-    if(replace(donor))
+    if(this->replace(donor))
     {
         donor.Release();
         return true;