Add a zone for OpenShift infrastructure if requested

Conflicts:
	manifests/named.pp

- Merge DNS TCP/UDP firewall sets