remove apache if the distro come with it
Merge branch 'master' into develop