Merge back from ShibHttpClient