DISPATCH-311: replace 'vhostname' with 'id'
8 files changed