merge oss execution environment protos (#250)

## Overview
The original PR for supporting execution environments added proto definitions to flyteidl that were not also synced with OSS. Since, there was a conflicting message (same id number). This is OK, since the execution environment protos were never released user-facing and will always be empty. This PR cherry picks the two oss PRs ([here](#5311) and [here](#5323)) that will ensure flyteidl is mirrored in terms of execution environment protos.

## Test Plan
This was tested locally by creating and using generated proto defs between oss and the private fork.

## Rollout Plan (if applicable)
There should be no user-facing issues here, just updating proto definitions for an internal dev flow.

## Upstream Changes
Should this change be upstreamed to OSS (flyteorg/flyte)? If so, please check this box for auditing. Note, this is the responsibility of each developer. See [this guide](https://unionai.atlassian.net/wiki/spaces/ENG/pages/447610883/Flyte+-+Union+Cloud+Development+Runbook/#When-are-versions-updated%3F).
- [ ] To be upstreamed

## Jira Issue
https://unionai.atlassian.net/browse/<project-number>

## Checklist
* [ ] Added tests
* [ ] Ran a deploy dry run and shared the terraform plan
* [ ] Added logging and metrics
* [ ] Updated [dashboards](https://unionai.grafana.net/dashboards) and [alerts](https://unionai.grafana.net/alerting/list)
* [ ] Updated documentation

flyteidl/protos/flyteidl/admin/execution.proto

@@ -331,9 +331,9 @@ message ExecutionSpec {
 
     // Tags to be set for the execution.
     repeated string tags = 24;
-    
+
     // Execution environment assignments to be set for the execution.
-    repeated core.ExecutionEnvAssignment execution_env_assignments = 25;
+    repeated core.ExecutionEnvAssignment execution_env_assignments = 26;
 }
 
 // Request to terminate an in-progress execution.  This action is irreversible.
@@ -478,4 +478,4 @@ message RunningExecutionsCountGetRequest {
 message RunningExecutionsCountGetResponse {
     // Count of the running executions.
     int64 count = 1;
-}
+}

flyteidl/protos/flyteidl/admin/matchable_resource.proto

@@ -132,7 +132,7 @@ message WorkflowExecutionConfig {
 
   // Environment variables to be set for the execution.
   Envs envs = 8;
- 
+
   // Execution environment assignments to be set for the execution.
   repeated core.ExecutionEnvAssignment execution_env_assignments = 9;
 }