two fixes

1 - Icinga, not Nagios
2 - Not a sample config file any more :)

Change-Id: I985eb916381c67b6e937ca34c7297a9cb7bcd4c1
Merge "two fixes" into production