refs# 7856 : https://dev.icinga.org/issues/7856
refs#7716 : https://dev.icinga.org/issues/7716
Signed-off-by: Nick Chappell <nick@intronic.org> Merged from: https://github.com/Icinga/puppet-icinga2/pull/47 refs#7220: https://dev.icinga.org/issues/7220