Backport support for latest faraday to 1.4.x

Peter Bolingrequested to merge
allow-latest-faraday-backport into 1-4-stable

Merge request reports