PRD-1292 fix
Corrected English.
Merge branch 'master' into prd1292

Conflicts:
	fuel_health/nmanager.py
	fuel_health/tests/smoke/test_create_volume.py
	fuel_health/tests/smoke/test_nova_create_instance_with_connectivity.py
	fuel_health/tests/smoke/test_nova_image_actions.py
PRD-1288 Change step in floating ip tests