Add XFF and X-Cache headers to error page

Change-Id: I4eef871232aca89399cab53c2e38f7a4659636a6
Merge "Add XFF and X-Cache headers to error page" into production