CLOUDIFY-1660 refactor unistall for code reuse on teardown command + some fixes
CLOUDIFY-1660 refactor-->class name changes