1021662 - using HTTPProxyAuth when using proxy with authentication to populate correct field in the header
1021662 - adding a class which inherits requests.auth.AuthBase and sets up proxy and user basic authentication headers correctly instead of overwriting each other