normalize travis config for merge into devel