Enable host-user matching for bot links
Merge branch 'protect-telnet-user-match' into next

* protect-telnet-user-match:
  Enable host-user matching for bot links

Conflicts:
	doc/UPDATES