Merge "Reenable debug cli telnet listener"
authorDamjan Marion <[email protected]>
Tue, 19 Jan 2016 21:05:28 +0000 (21:05 +0000)
committerGerrit Code Review <[email protected]>
Tue, 19 Jan 2016 21:05:28 +0000 (21:05 +0000)

Trivial merge