Rewritten version of Finn Bock's SF patch #446907 (Allow jython to complete test_import).
Rewritten version of Finn Bock's SF patch #446907 (Allow jython to
complete test_import).

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator