ticket:11056: Update with collation fixes for 11058

git-svn-id: http://source.icu-project.org/repos/icu/icu@36158 251d0590-4201-4cf1-90de-194747b24ca1