SSP-1788 Fix for department, division and program stores loading recursively
SSP-2478 inadvertently checked in new sort behavior.  Waiting on decision by project lead.