2198: Allow underscore in subdomain names
2198: Allow underscore in subdomain names
Merge branch 'production' into i-2198