Merge "Remove iniparse and urllib3 dependencies"