SSP-1838 Map Plan Template now has own template for displaying a Matrix Output.
SSP-1820 Terms and Courses in Terms are now sorted. Terms by startDate, Courses by orderInTerm
SSP-1849 fixes for ChallengeServiceTest. not all errors fixed. not familiar with code base.