Merge pull request #2678 from raydavis/raywip

CLC-3811 Simplify cache keys for more realistic QA
CLC-3828 Ex-students should see student-ish links in My Campus