CBLT-42:  organize WORKSPACE, fix error working in clean environment

Change-Id: Iefb2600336e90dd7bf59f1a7aa848af401f99198
Reviewed-on: http://review.couchbase.org/37205
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>