Revert "Beta-2 refresh: Re-building build 1055 plus two couchbase-cli changes for beta-blocker bug MB-11902"

This reverts commit dc1ccdf3e0147c7737a16c8a1d5374f060265b58.
Change-Id: Ida29acb077518860693369247205ae9f8aae838b
Reviewed-on: http://review.couchbase.org/40396
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>