MB-11411:  2.5.1 hotfix: MB-10979-MB-11411
identical to 2.5.1 release, except ep-engine uses branch "MB-10979-MB-11411"

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