changes for > 2 control nodes.Control nodes will now be calculated from discovery instead from testbed.py
Incorporated review comments
Merge pull request #377 from sandip-d/master

Incorpoarted review comments