CFY-644 (not the prettiest) bug fix
CFY-644 (not the prettiest) bug fix

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