CBD-688: Add cli support for 2.0 apis

Revise based on review feedback

Change-Id: If7877acce5da56e4061aacb128327177149e43e5