remove unused import
clean up unused ref to disable
remove unused exc
Clean out unused object
Fix impropper exception catch
clean up unused exc
remove unused import
Remove unused ref in alternatives
Remove unused import
Remove patches and update to upstream patch release 0.12.1
remove unused import
Merge pull request #3639 from herlo/develop

Remove patches and update to upstream patch release 0.12.1
Fix test=true for pkg state
remove unused import
Add pip.py test for upgrading packages
Fix indent style issue