cli: prepare for the next development iteration

Change-Id: I0f07bddf73c4fa26c9c25b64ae2b4dd3ea067921
Signed-off-by: Michael pasternak <mpastern@redhat.com>