Update Apache Config Templates

Merged Paul Cammish requested to merge apache-configs10 into buster-testing