Further alignment with 8.0.x and later. Fixes Linux test failures. This is fix 4 of 4 for CVE-2017-12617