CFY-2344 merged yaml properties
CFY-2344 merged yaml properties

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