CBSE-1321: ep-engine hotfix
Otherwise identical to 2.5.1

Change-Id: I2fa12a8e29e833af23241103b6f258036aa706be
Reviewed-on: http://review.couchbase.org/40606
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>