Make imports static on builder
upgrade to couchbase java client beta 2 + lock tests and implementation