more nagios -> icinga cleanup

Change-Id: Ifee709cbe19f1296b5e11c0d33a75caa2203bb44