CLOUDIFY-2103 dsl enhancements.