Merge changes I5e14eeb1,I0bcf0516

* changes:
  Replace ICU.getAvailableCollatorLocales() with ICU4J Collator.getAvailableLocales
  Test consistency of getAvailableLocales with ICU