Include the DHCP domain in the list of search domains when DHCP is not being overridden
Merge branch 'dhcp-domain'

Conflicts:
	manifests/config.pp