ICU-6098 4.0 pre-d04  merges: r24317 r24318 r24319

X-SVN-Rev: 24320
17 files changed