[TO_STAGE] Bug 1160752 - Make apache-vhost more atomic