Updates for ICU_CONFIG name changes
Merge remote-tracking branch 'origin/master'