Issue #2331533 follow-up: some changes to .travis.yml