2.1.0 branch at build 2.0.2-824

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