Cookie/Vary munging for text, Cache-Control header replacements

Change-Id: I152e4c2e130f40e4fd9c5381353a650987c34012
Merge "Cookie/Vary munging for text, Cache-Control header replacements" into production