CLC-3111 Fix MyActivities::Merged cache key
CLC-3110 - Create two links for the Financial Aid office on the new Financial Resources card
https://jira.media.berkeley.edu/jira/browse/CLC-3110
CLC-3051 - Textbooks: required materials offers a choice, but we show only one
https://jira.media.berkeley.edu/jira/browse/CLC-3051

** Please check the Bamboo builds before merging **
Merge pull request #2012 from christianv/CLC-3051

CLC-3051 - Textbooks: handle choice of required materials
Merge pull request #2014 from ctweney/clc-3111

CLC-3111 Fix MyActivities::Merged cache key
Merge pull request #2015 from christianv/CLC-3110b

CLC-3110 - Create two links for the Financial Aid office on the new Fina...
CLC-3115 Add new user role for CalNet guest accounts
Merge pull request #2016 from raydavis/raywip

Looks good, @raydavis!
CLC-3115 Add new user role for CalNet guest accounts