Lps 48099

This is the last pull for this ticket. All the OrderByComparator generic warnings should be gone after this.

Please let us know if eclipse is still complaining anything.