part 1 of cleaning up files from nagios to icinga

Change-Id: Ie70b4a768b43ecf172881168ec3acb5b120e19ed
Merge "part 1 of cleaning up files from nagios to icinga" into production