toy-sundar over 3.0 RC1

Change-Id: I2a3666ff846cd88c2ac74de0d1c85a333092c406
Reviewed-on: http://review.couchbase.org/41086
Reviewed-by: Sundararaman Sridharan <sundar@couchbase.com>
Tested-by: Sundararaman Sridharan <sundar@couchbase.com>