* origin/master: travis-ci: add ca and database as dependencies travis-ci: changes for EPICS 7 Base structure # Conflicts: # .travis.yml # ci/travis-build.sh # ci/travis-prepare.sh