Fixes #4074: Fix the Apache vhost after a merge failure
Merge pull request #348 from Kegeruneku/bug_4074/int/4074_fix_the_rudder_vhost_after_merge_failure

Fixes #4074: Fix the Apache vhost after a merge failure