fix apache template
Merge branches 'apache2-template' and 'develop' into develop