CBQE : 3138 more fixes
CBQE : 3138 more fixes

Change-Id: Ib90368cb8726ff0cc75016af652e398276174139
Reviewed-on: http://review.couchbase.org/57007
Reviewed-by: sandip nandi <7cd9c95c004724be086626cd470f9c018506c6b8@couchbase.com>
Tested-by: sandip nandi <7cd9c95c004724be086626cd470f9c018506c6b8@couchbase.com>

couchbase/perfrunner,dkao-cb/perfrunner,pavel-paulau/perfrunner,couchbase/perfrunner,pavel-paulau/perfrunner,couchbase/perfrunner,pavel-paulau/perfrunner,EricACooper/perfrunner,pavel-paulau/perfrunner,EricACooper/perfrunner,pavel-paulau/perfrunner,EricACooper/perfrunner,couchbase/perfrunner,EricACooper/perfrunner,dkao-cb/perfrunner,couchbase/perfrunner,mikewied/perfrunner,couchbase/perfrunner,mikewied/perfrunner