MB-100: Move ep-engine branch forward

Change-Id: I63fbc4122910d5bba4cb109a0e3a590f6b900793
Reviewed-on: http://review.couchbase.org/23792
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>