Merge pull request #2904 from raydavis/raywip

CLC-3031 Fix message for Double Major academic block
CLC-4163 Followup: Revoke Google token when opting out of CalCentral
Merge pull request #2905 from ctweney/clc-4163-followup

CLC-4163 Followup: Revoke Google token when opting out of CalCentral
CLC-4006 Fix block messages for codes with leading zero