Icinga 2: More fixes, still wip.

Refs #2557