CLC-3465 (QA) Make inclusion of next year in FinAid configurable, and disable...

...d by default

QA branch version of #2274