ICU-6098 merge from trunk r24299, r24307, r24310

X-SVN-Rev: 24311
51 files changed