ICU-8638 Merge some changes from r30194 to 4.8.1 so UCNV_NO_CONVERSION passes

X-SVN-Rev: 30381
16 files changed