Merge "Remove nova-network from scenario tests"