Merge pull request #2709 from raydavis/raywip

CLC-3951 Align authz rules when authenticating session through LTI
CLC-3983 Append UC Berkeley to event locations
Merge pull request #2710 from ctweney/clc-3983

CLC-3983 Append UC Berkeley to event locations
CLC-3988 Add last day of instruction to Term, as distinct from last day of classes
CLC-3988 Fix failing calendar tests
Merge pull request #2711 from ctweney/clc-3988

CLC-3988 Distinguish between end of instruction and end of classes
CLC-3966 CLC-3997 Integrate TA role; fix duplicate memberships
This commit only handles incremental refresh. The fix for batch refresh is TODO.