CFY-836 code cleanup
CFY-836 code cleanup

isaac-s/cloudify-plugins-common,geokala/cloudify-plugins-common,codilime/cloudify-plugins-common,isaac-s/cloudify-plugins-common,cloudify-cosmo/cloudify-plugins-common,codilime/cloudify-plugins-common,cloudify-cosmo/cloudify-plugins-common,xdegenne/cloudify-plugins-common,isaac-s/cloudify-plugins-common,codilime/cloudify-plugins-common,cloudify-cosmo/cloudify-plugins-common