Feature/cloudify 2504 celery out