Fix icinga2 output validation

refs #2688
Merge branch 'support/1.4' into next