Remove trailing whitespace
fix whitespace
Removed 1.1 upgrade testing
Merge branch 'master' into custom_upgrade

Conflicts:
	upgrade_through_versions_test.py