Changed discovery tests to new infra
Merge branch 'test_parallelism' of github.com:Juniper/contrail-test into test_parallelism