Revert "TEMPORARILY making branch-master identical to rel-3.0.0

This reverts commit 610c430d3673e5f89d81d5bfdfc6fee97365956e.

Change-Id: I8488c3f6010396c061b6572308b7a2a30cd99527
Reviewed-on: http://review.couchbase.org/40930
Reviewed-by: Sriram Melkote <siri@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>