improvements on etag on put
merged changes in from master