Merge branch 'CHEF-1162'
CHEF-4233: get rid of extra chef_type/data_bag keys added to data bag in knife upload