service-management: if previous code was compiled with ENABLE_SYSTEMD,

the systemd service manager will be the current service manager,
even that systemd wasn't active.

Signed-off-by: Juhász Viktor <jviktor@balabit.hu>
Merge pull request #327 from juhaszviktor/f/service-manager-fix

service-management: if previous code was compiled with ENABLE_SYSTEMD,
riemann: Do not crash without attributes() set

When using a riemann destination, do not crash when no attributes are
set.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Merge pull request #321 from algernon/h/riemann/fix-no-attributes

riemann: Do not crash without attributes() set