CLC-4138 Fix view-as and reauthentication
Merge pull request #2844 from raydavis/raywip

CLC-4138 Fix view-as and reauthentication