Set built in etag when using ETag as well

AFAIK, the correct header we should be using is ETag. This sets the built in when that is used and leaves "E-Tag" as is.