HPCC-11995 Update to match 5.0

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
HPCC-11995 Improve logging for getActivityInfo

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #6290 from ghalliday/issue11995b

HPCC-11995 Improve logging for getActivityInfo

Reviewed-by: Kevin, Jake, Tony
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