HPCC-11825 Fix issues with some versions of ICU (post 5.0?)

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

HPCC-11825 Fix issues with some versions of ICU (post 5.0?)

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11844 Fix inconsistency generated in expression tree

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

HPCC-11844 Fix inconsistency generated in expression tree

Reviewed-By: Jamie Noss <james.noss@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.6' into closedown-4.2.x

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