Apply etag suffix to all content-encoding. Closes #2166