fixed CLI setup.py
Merge branch 'master' into CFY-1231-fix-teardown