Cleaned up X-Forward-Proto variance

X-CS=ON now does not vary on protocol or proxy

Change-Id: I4247efe54c005cb6c2a22b6fa579fcc146204f5f
Merge "Cleaned up X-Forward-Proto variance"