Merge changes from topic "icu60"

* changes:
  Updated test expectations for ICU 60.
  Replace clearCachedDefault with setICUDefault