ICU-6866 merge r25983(#6909) and r25985/r25987(#4790 - fix for uconfig issue in spoof detection code)

X-SVN-Rev: 25988
18 files changed