Fix bug with timemachineport broctl option

Removed extra "/tcp" from the timemachine port (it's already included
in the string value).  Also improved formatting of cluster-layout.bro
for readability.
Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fix bug with timemachineport broctl option