[TO_STAGE] Update RHC to work with HTTPClient >= 2.4.0