CFY-1373 new ctx api
Merge branch 'master' into CFY-1373-new-ctx-api

Conflicts:
	tests/dev-requirements.txt
Merge branch 'master' into CFY-1373-new-ctx-api

Conflicts:
	tests/dev-requirements.txt
CFY-1373 agent/plugin installer use new ctx api
CFY-1373 ctx new api
CFY-1373 fixed unit tests
Merge branch 'master' into CFY-1373-new-ctx-api
CFY-1373 diamond plugin branch
CFY-1373 fixed tests
CFY-1373 fixed mock to use new ctx api
CFY-1373 fixed tests
CFY-1373 flake8
CFY-1373 fixed unit tests
CFY-1373 fixed unit tests
CFY-1373 fixed unit tests
CFY-1373 fixed unit tests
CFY-1373 fixed unit tests
CFY-1373 fix branch name for tests
Merge branch 'master' into CFY-1373-new-ctx-api
Merge pull request #144 from cloudify-cosmo/CFY-1373-new-ctx-api

Cfy 1373 new ctx api