CFY-1694 removed CLI branch used and some refactoring
CFY-1694 removed CLI branch used and some refactoring

isaac-s/cloudify-system-tests,isaac-s/cloudify-system-tests,cloudify-cosmo/cloudify-system-tests,isaac-s/cloudify-system-tests,codilime/cloudify-system-tests,codilime/cloudify-system-tests,codilime/cloudify-system-tests,cloudify-cosmo/cloudify-system-tests