cli: prepare for the next development iteration

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