2.5.1.1 cumulative HOT-FIX

Change-Id: Iacd198fa71aed0d890990a21127ebd940f50c63c
Reviewed-on: http://review.couchbase.org/41372
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>