Adds owner/group to default vhost data
Merge branch 'master' into 1227-simplify