Starting to work on .next

Change-Id: Iaff9cbc4d6ce708b63174a0accc8c3d9a7790124
Reviewed-on: http://review.couchbase.org/41440
Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>