ICU-6098 merge r24264:24276 from trunk

X-SVN-Rev: 24277
7 files changed