MB-9069: Include missing commits in 2.5 release

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