cli: prepare for the next development iteration

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