Was checking original request instead of proxied request when determining if I should remove x-forwarded-* headers.
Merge branch '14.01' into 14.06
Merge branch '14.06'