avahi: Fixes from review comments
avahi: Add hostname and port template values to names
avahi: Simplify config to single value