Use %> instead of -%> at the end of some ERB tags so that trailing whitespace isn't surpressed. Surpressing the trailing whitespace caused problems where there was one more parameters listed after each other. Each parameter would get squashed onto a single line, causing a syntax error when Icinga2 parsed the object file.

refs#7715: https://dev.icinga.org/issues/7715
CHANGELOG update.
Merge branch 'fix/7715/template_whitespace_fix'

refs#7715: https://dev.icinga.org/issues/7715
CHANGELOG update.