CBD-1208: Sync rel-3.0.0.xml with branch-master.xml

Change-Id: I49d9409401feba29c24991a8221063f4eb1d07bf
Reviewed-on: http://review.couchbase.org/32626
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>