Merge branch 'master' of https://github.com/sergeygalkin/fuel-ostf-tests

Conflicts:
	fuel_health/savanna.py