CLC-2601 Cache the JSONified feeds for most big merged models when they're called by controllers
CLC-2601 Fix failing act-as test
Merge pull request #1655 from ctweney/clc-2601

CLC-2601 Caching the JSONified data for most big feeds