Merge branch 'main' into main

Author: gm2552

org/contributors.yml

@@ -140,6 +140,7 @@ contributors:
 - mrosecrance
 - mukeshkhicher-br
 - mvach
+- nader-ziada
 - nakulogale-cb
 - nand2
 - nebhale

toc/working-groups/foundational-infrastructure.md

@@ -239,6 +239,8 @@ areas:
   reviewers:
   - name: Greg Meyer
     github: gm2552
+  - name: Nader Ziada
+    github: nader-ziada
   repositories:
   - cloudfoundry/concourse-infra-for-fiwg
   - cloudfoundry/bosh-stemcells-ci
@@ -275,6 +277,8 @@ areas:
     github: anshrupani
   - name: Greg Meyer
     github: gm2552
+  - name: Nader Ziada
+    github: nader-ziada
   repositories:
   - cloudfoundry/bbl-state-resource
   - cloudfoundry/bosh

toc/working-groups/service-management.md

@@ -108,9 +108,19 @@ areas:
     github: syslxg
   - name: Konstantin Semenov
     github: jhvhs
+  - name: Geoff Franks
+    github: geofffranks
+  - name: Maria Shaldybin
+    github: mariash
+  - name: Amin Jamali
+    github: winkingturtle-vmw
+  - name: Marc Paquette
+    github: marcpaquette
   bots:
   - name: Cryogenics CI Bot
     github: Cryogenics-CI
+  - name: CI Bot
+    github: tas-runtime-bot
   repositories:
   - cloudfoundry/existingvolumebroker
   - cloudfoundry/goshims