update manifest based on Alk's branch

Change-Id: If5ee2d0f727e6fcbf84592d8cf421f8049140bf5
Reviewed-on: http://review.couchbase.org/38600
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>
Tested-by: Pavel Paulau <pavel.paulau@gmail.com>