Catch Net::HTTP::Persistent::Error internally.
Merge branch 'next' into rh-mock

* next:
  Catch Net::HTTP::Persistent::Error internally.
Net::HTTP::Persistent::Error is now wrapped internally.