[emi-nagios] Tidy spec file & sources.
Merge branch 'emi-nagios-fixes'