CFY-1025 change monitoring interfaces
CFY-1025 for travis
CFY-1025 use new monitoring interfaces
CFY-1025 for travis
CFY-1025 fix test
Merge branch 'master' into CFY-1025-update-monitoring-interfaces

Conflicts:
	tests/dev-requirements.txt
Merge pull request #147 from cloudify-cosmo/CFY-1025-update-monitoring-interfaces

Cfy 1025 update monitoring interfaces