move to zabbix 2.2
new key source
add key back
restructure zabbix host creation
don't use Ipv6 if we do not have a address
typo
unique host interfaces
undef is not possible as argument to hiera
to version 2.4
node_id no longer needed as feature is disabled
Merge branch 'master' of https://github.com/proventa/puppet-zabbix into develop

Also remove NodeId completely as per ZBXNEXT-1343
Conflicts:
	manifests/agent.pp
	manifests/agent/param.pp
	manifests/debian.pp
	manifests/params.pp
	templates/zabbix_server.conf.erb