Merge pull request #2629 from reaperhulk/travis-refactor

refactor travis custom openssl code to work with other versions