CLC-3030 - Residency flag is inconsistent between academic status pop-up...

... and My Academics Status and Blocks

https://jira.media.berkeley.edu/jira/browse/CLC-3030