2.2.0-837 (refresh)

Change-Id: I2e1b98916d6c994504359d5fa1d4168eff6cebde
Reviewed-on: http://review.couchbase.org/36866
Reviewed-by: Eric Limare <eric.limare@couchbase.com>
Tested-by: Eric Limare <eric.limare@couchbase.com>