#2074 - Mirror some additional file_proxy checks in data_rest.
Merge pull request #396 from shadlaws/fix_2074_master

#2074 - Mirror some additional file_proxy checks in data_rest.