Nagios packaging cleanups