Fixes for the proxy resource back ported from berkshelf-api.