Fix broken test after merge into the 2.8.x codebase

Cause was Apache HTTPClient upgrade