CFY-1193 added test for deployments state
CFY-1193 added test for executions state
Merge branch 'master' into CFY-1193-remove-python-webserver-test
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-manager into CFY-1193-remove-python-webserver-test
CFY-1193 fix flake
CFY-1313 query celery status with celery API
CFY-1313 fix constants reference
CFY-1313 fix config
Merge branch 'master' into CFY-1313-celery-wait-for-started
CFY-1313 various improvements
CFY-1313 wait for service to start
CFY-1313 fix flake
CFY-1313 fix tests and imports
CFY-1313 fix tests
CFY-1313 fix setup.py
CFY-1313 install mock to plugin tests virtualenv
CFY-1313 fix mock
Merge branch 'master' into CFY-1193-remove-python-webserver-test

Conflicts:
	tests/workflow_tests/test_rest_api.py
CFY-1193 fix test
Merge pull request #122 from cloudify-cosmo/CFY-1193-remove-python-webserver-test

Cfy 1193 remove python webserver test