ICU-6646 Merge 4.0.1 changes and synchronize eclipse35 branch with maint-4-0 @ r25219.

X-SVN-Rev: 25226
43 files changed