CBD-1207:  RESTORE 95375aeba9c90a150a1a8b6e6b048bcfc6db57e8

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