use sigkill immediately for unresponsive telnet

-fix order of arguments
Merge branch '2.3.x' into 2.3.x-saas