CBD-829:  use 2.0.2 branches, and couchbase-cli

Change-Id: If41ad38e2fdbd94f38a3f2da5b7891451428a88a
Reviewed-on: http://review.couchbase.org/24594
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>