MB-11411:  UNDO 316217fc8ec77f35a0c29183b42648604635d948
           ep-engine now uses branch "MB-11411"

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