Revert "SSP-1820 Terms and Courses in Terms are now sorted. Terms by startDate, Courses by orderInTerm"

This reverts commit 8061b7d722eedf57c13a76c73393b11786df29ee.

This was a feature add, so cannot be included in 2.0.1 at this time.
Revert "SSP-1838 Map Plan Template now has own template for displaying a Matrix Output."

This reverts commit 400eb2cb345880fdf633948a4768baf755ef693a.

This was a feature add, so cannot be included in 2.0.1 at this time.