Smarter replacement of view model caches
Merge branch 'master' of ssh://github.com/cloudfoundry-incubator/admin-ui into CCDBOption