Fix installation of Apache on Travis.
Merge branch 'SCHOLAR-3.x' into 2087-test