CBQE-2522:Testrunner tests are broken

The issue came since I had converted services to services_map which was not working fine. Reverted the changes back to original implementation.

Change-Id: Id72deb9da5f1ff42ad15691cddc946274672814e
Reviewed-on: http://review.couchbase.org/44270
Reviewed-by: Parag Agarwal <agarwal.parag@gmail.com>
Tested-by: Parag Agarwal <agarwal.parag@gmail.com>