cli: prepare for the next development iteration

Change-Id: I6e050073aad7c385bb120101a1a460ce83cca23e
Signed-off-by: Michael Pasternak <mpastern@redhat.com>