Group import ignores schoolterm

The import of groups does not respect school terms. We need to:

• Fitler on current school term when matching existing groups
• Set current school term when adding groups
• Ensure the matched groups stay correct until users are linked