Merge "Modify CliRenderer, CliBuilder, CliTrigger and TelnetUtils."