Merge branch 'stable-2.11'
* stable-2.11
Do not overwrite HTTP auth configuration settings
NOTE: The change was already in master and cherry-picked to stable-2.11
Merging from stable-2.11 just to update the tracking on Git
Change-Id: Ie972904371e871005ec683ce40439ead673771ab