ICU-6866 merge r25946 and r25942

X-SVN-Rev: 25947
6 files changed