Merge from 'apache', 'iptables', 'nagios' and 'pnp4nagios' branches