Merge branch 'candidate-6.2.10' into candidate-6.4.0

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

roxie/ccd/ccdcontext.cpp

@@ -1981,13 +1981,13 @@ public:
     }
     virtual ISectionTimer * registerTimer(unsigned activityId, const char * name)
     {
+        CriticalBlock b(contextCrit);
         if (activityId && graph)
         {
             IRoxieServerActivity *act = graph->queryActivity(activityId);
             if (act)
                 return act->registerTimer(activityId, name);
         }
-        CriticalBlock b(contextCrit);
         ISectionTimer *timer = functionTimers.getValue(name);
         if (!timer)
         {