Modified import logic for versions.py so ImportErrors will be reported

Changed upgrade.py so that ImportErrors are reported instead of being swallowed (previously used as a check for existence of a versions.py).
It might be good to have a grep test on the "$TEST_KEY.err" to make sure it's
really an ImportError that caused the fail.