riemann: Migrate to latest merge-queue/3.5 status

The value-pairs() + LogTemplateOptions (and on-error handling) code has
been reworked, migrate the Riemann destination to the newest version.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>