cleanup and fixes post-merge

use better variable names for old last_modified and etag
fix disable etag/last_modified
remove extraneous reference to old rest_client