We have some code and annotations in package_test_internal.py that is not compatible with Python 3.5, which is used on two of the test platforms (Ubuntu 16.04 and Debian 9.1). Make the version compatibility changes necessary for tests to pass on these platforms.