backport icu bugfixes
refs #858