Adding support for compiling against Icinga.
Merge branches 'icinga' and 'master'