fix tests for new topo runner
Merge pull request #91 from iansmith/fix_tests_for_new_topo_runner_with_etcd

fix tests for new topo runner
Run buildbot on Pickett