Fix after execution on 3.1 FLAT/VLAN and 3.2 FLAT/VLAN
Merge branch 'PRD-1801-KeyError' of https://github.com/Mirantis/fuel-ostf-tests into PRD-1801-KeyError

Conflicts:
	fuel_health/tests/smoke/test_nova_create_instance_with_connectivity.py