[3.6] Clean up Travis config (GH-5727)#5738

zware merged 2 commits intopython:3.6python/cpython:3.6from

zware:backport-7eb3f82-3.6zware/cpython:backport-7eb3f82-3.6Copy head branch name to clipboard