Updated default vhost config to use apache log variable
Merge branch 'master' into trusty