CBQE-0:fix 2i integration framework bugs and tests

Change-Id: I57fc09c9e8ed8c3e71ec2cf7a9eda0dca469cff1
Reviewed-on: http://review.couchbase.org/44487
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Parag Agarwal <agarwal.parag@gmail.com>
Tested-by: Parag Agarwal <agarwal.parag@gmail.com>