Merge change I3d8565f0

* changes:
  Collation.getSortKey returns keys generated by a different algorithm