Add check that apache2 configuration folder exists.
Merge branch 'master' into oneiric