simplify cbagent imports

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