Merge "Updated test expectations for ICU 60.2"