Merge pull request #2461 from raydavis/raywip

CLC-3466 Data-driven Financial Aid years
NOJIRA Fix naming of AcademicsModule