Couchbase Java Client

merge in changes from the release11c branch