If --dns-name is specified, set it as DHCP host-name
in preference to the --hostname field.
Merge pull request #999 from r0ckpine/local/testing

Fix host statement generation in dhcp.template