Merge branch 'candidate-4.2.8' into closedown-5.0.x

Conflicts:
	esp/services/ws_workunits/ws_workunitsQuerySets.cpp

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