Merge "CLI: Address multiple issues."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 20 Dec 2017 14:54:58 +0000 (08:54 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 20 Dec 2017 14:54:58 +0000 (08:54 -0600)

Trivial merge