SWC-1671

Couldn't find existing code that sorted entity headers, so just passed a simple comparator to Collections.sort.