Feature/cloudify 1759 monitor close