Don't smoosh hostname and domainname in API Upstream-commit: ae75435dae9cb386eb213774f97fe35cdcafff49 Component: engine