fixed imports in windows test and modify_yaml in two deps test
Merge branch 'develop' of github.com:cloudify-cosmo/cloudify-system-tests into develop