Draft: Resolve "Cleanup vhost.conf.master"

Open Thom requested to merge 6324-cleanup-vhost-conf-master into develop

Closes #6324

Merge request reports