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