CBQE-0: revert the changes done in https://github.com/couchbase/testrunner/commit/4384976ef2f15adbde4c743d6627424cb8e4629c

Change-Id: I783a2eeb606e2c4fbd8bbc1f20eca99b1d5c4b27
Reviewed-on: http://review.couchbase.org/30337
Reviewed-by: Sangharsh Agarwal <sangharsh.agarwal@globallogic.com>
Tested-by: Sangharsh Agarwal <sangharsh.agarwal@globallogic.com>