Fix failing test
Merge pull request #2056 from edwlook/CLC-3169-3

NOJIRA - Fix failing test
Polish videoController.js
Update youtube link for failing test
Merge pull request #2057 from edwlook/CLC-3195

CLC-3195 - Polish videoController.js
Merge pull request #2058 from edwlook/CLC-3169-3

NOJIRA - Update youtube link for failing test
CLC-3187: LiveUpdates: Do warmup in a forced-cache-write mode

https://jira.media.berkeley.edu/jira/browse/CLC-3187

Do warmup in a forced-cache-write mode, making sure the warmer
forcibly updates what's in the cache without expiring it first.

Requires adjusting my_merged_model's get_feed method and Cacheable's
fetch_from_cache receive a parameter that forces the feed to be
written to the cache during warmups.

The force_cache_write argument is currently only used in the UserCacheWarmer.

Except in this particular case MyMergeModel::get_feed requires no arguments at all.

Additional notes:
- Stopped using the optional :opts argument in my_up_next model's
get_feed_internal because this argument was deprecated in this branch.
- Stopped passing arbitrary :opts to get_feed_internal in my_merged_model.
- Also, stopped expecting arbitrary :opts in my_merged_model's
get_feed_as_json method. :opts is not being used anywhere.
- Added my_merged_model_spec with a test borrowed from UserApi for
checking cache handling with the correct parameters passed to Cacheable
- Added a check in the user_cache_warmer to make sure the force_cache_write
argument is being passed as true when warming up merged feeds.
Merge pull request #2059 from chikoon/CLC-3187-forced-cache-write-warmup

CLC-3187: LiveUpdates: Do warmup in a forced-cache-write mode
NOJIRA My Classes dummy JSON was never updated to include current_term from CLC-2218
Also fixed misleading "source" for Canvas group
CLC-2498 Untangle My Classes and My Groups sites implementation
To support addition of sites to My Academics
CLC-2498 Fix testext
Merge pull request #2061 from raydavis/raywip

CLC-2498 Untangle My Classes and My Groups sites implementation
CLC-3187-ii: LiveUpdates: eliminate MERGED_FEEDS_EXPIRATION

https://jira.media.berkeley.edu/jira/browse/CLC-3187

Deleted MERGED_FEEDS_EXPIRATION instance of UserCacheInvalidator.

Since UserCacheWarmer now forces write to the cache, there's no
need to expire the cache on merged feeds via observers.

Also deleted MERGED_FEEDS_EXPIRATION from the cache
cache_tools initializer and references to it in the
live_updates_warmer_spec.
Merge pull request #2062 from chikoon/CLC-3187-forced-cache-write-warmup

CLC-3187-ii: LiveUpdates: eliminate MERGED_FEEDS_EXPIRATION