CBQE-1119: fix couchbase-cli after latest dev changes

Change-Id: I42f99d114d1a859c7d9a691bdbc7ed873b538ba8
Reviewed-on: http://review.couchbase.org/26118
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>