MB-100: Include all the fixes targeting for 2.5

Change-Id: Ia5b3e4e0e313c22158ee28341ae2095602bdee82
Reviewed-on: http://review.couchbase.org/31557
Reviewed-by: Bin Cui <bin.cui@gmail.com>
Tested-by: Bin Cui <bin.cui@gmail.com>