Merge branch 'ls/travis-enable-httpd-tests'