changes needed for move to httpcomponents

The changes are in code that lived in heritrix3 until recently.