CLC-2619 Filter out inactive memberships
Merge pull request #1679 from ctweney/clc-2619

CLC-2619 Filter out inactive memberships
CLC-2606 Show academics data if we have it
Merge pull request #1681 from ctweney/clc-2606

CLC-2606 Show academics data if we have it