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 this from: https://github.com/Icinga/puppet-icinga2/pull/44 refs#7677: https://dev.icinga.org/issues/7677