Merge "Revert "Reenable debug cli telnet listener""