Remove urllib3-specific kwargs from general code
Merge pull request #1441 from Lukasa/1395

Remove urllib3-specific kwargs from non-urllib3 branch.