Restore etag on 304. Change default to modify etag on vary. Closes #2153. Closes #2093