Small fixups

Fix kafka::server comment spacing

Use new-style variables in template

Change-Id: I75e03826adfe3b3423f575ac2cb6535232cdcd90