Merge branch 'refs/heads/t/com_sender'

A single commit which was cooking in next for several months.

* refs/heads/t/com_sender:
  Avoid duplication of sender subcommands.

diff --cc command.c
Simple merge

diff --cc udp_send.c
Simple merge