Merge remote-tracking branch 'origin/candidate-4.2.8' into closedown-5.0.x

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

Conflicts:
	esp/services/ws_smc/ws_smcService.cpp

esp/services/ws_smc/ws_smcService.cpp

@@ -664,8 +664,11 @@ ActivityInfo* CWsSMCEx::getActivityInfo(IEspContext &context)
         return activityInfoCache.getLink();
 
     DBGLOG("CWsSMCEx::getActivityInfo - rebuild cached information");
+    {
+        EspTimeSection timer("createActivityInfo");
+        activityInfoCache.setown(createActivityInfo(context));
+    }
 
-    activityInfoCache.setown(createActivityInfo(context));
     return activityInfoCache.getLink();
 }
 

system/jlib/jdebug.cpp

@@ -387,7 +387,7 @@ double getCycleToNanoScale()
 
 void display_time(const char *title, cycle_t diff)
 {
-    DBGLOG("Time taken for %s: %"I64F"d cycles (%"I64F"dM) = %"I64F"d msec\n", title, diff, diff/1000000, cycle_to_nanosec(diff)/1000000);
+    DBGLOG("Time taken for %s: %"I64F"d cycles (%"I64F"dM) = %"I64F"d msec", title, diff, diff/1000000, cycle_to_nanosec(diff)/1000000);
 }
 
 TimeSection::TimeSection(const char * _title) : title(_title)