CDB-2891 more varnish/redis key changes