cli: prepare to the next development iteration

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