WL-3153 Switch to using calendar year. (bug fix)

Previously the code wrongly assumed that the term code referred to the academic year when this is not the case. The update switches to treating it as the calendar year.

This means the sorting of terms changes.