Try getting rid of the "upgrade-all" shenanigans.
Merge pull request #474 from adam-vessey/7.x-fix-travis

Try getting rid of the "upgrade-all" shenanigans.
Merge remote-tracking branch 'origin/7.x' into 7.x-USDA-41