fix hard coded subdomain name for vhosts, use dns config key
Merge branch 'develop'