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

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/closedown-5.0.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10957 Update test to reflect soft-hyphen issues between ICU versions

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

HPCC-10957 Update test to reflect soft-hyphen issues between ICU versions

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'master' into candidate-5.0.0

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