NOJIRA: Remove cache settings from host-settings-sample, to encourage use of defaults.
PAHMA-751: Experiment with smaller cache times, so users don't have to clear their cache as much after updates.
Merge branch 'ucb-deploy_4.0' into cinefiles_4.0