CFY-854 improved mock
Merge branch 'develop' into feature/CFY-729-rename-worker-config-to-cloudify-agent