Update .travis.yml

Backport solutions/updates from trunk.