Merge pull request #16070 from nabinhait/travis-fix-1

Travis fixes