Add pip.py test for upgrading packages
Fix indent style issue
Merge pull request #3641 from basepi/develop

Develop