Post merge updates

Signed-off-by: Łukasz Gryglicki <[email protected]>

company_developers2.txt

@@ -9067,7 +9067,7 @@ Elsen:
 	lbpage: lapsmores!gmail.com from 2018-09-01
 	lbpage: lbpage!users.noreply.github.com from 2018-09-01
 Elsevier Limited:
-	AverageMarcus: AverageMarcus!users.noreply.github.com from 2016-02-01
+	AverageMarcus: AverageMarcus!users.noreply.github.com, marcus!giantswarm.io from 2016-02-01 until 2021-09-10
 	Constantin07: Constantin07!users.noreply.github.com, cosbug!gmail.com from 2018-06-01 until 2018-10-01
 	MarcusNoble: MarcusNoble!users.noreply.github.com, m.noble!elsevier.com from 2016-02-01
 	ahmad-hamade: ahmad-hamade!users.noreply.github.com from 2020-03-01
@@ -15007,6 +15007,7 @@ Giant Leap:
 Giant Monkey Software Engineering:
 	paulmenzel: pmenzel!molgen.mpg.de
 Giant Swarm GmbH:
+	AverageMarcus: AverageMarcus!users.noreply.github.com, marcus!giantswarm.io from 2021-09-10
 	JosephSalisbury: JosephSalisbury!users.noreply.github.com, salisbury.joseph!gmail.com
 	MarcelMue: MarcelMue!users.noreply.github.com, marcel.mueller1!rwth-aachen.de
 	TheNeikos: neikos!neikos.email from 2017-06-01

company_developers6.txt

@@ -15557,7 +15557,7 @@ STEMN:
 STET:
 	YannRobert: YannRobert!users.noreply.github.com, yann.robert!anantaplex.fr until 2016-05-01
 STFC:
-	AverageMarcus: AverageMarcus!users.noreply.github.com until 2016-02-01
+	AverageMarcus: AverageMarcus!users.noreply.github.com, marcus!giantswarm.io until 2016-02-01
 	MarcusNoble: MarcusNoble!users.noreply.github.com, m.noble!elsevier.com until 2016-02-01
 	ionut-arm: ionut-arm!users.noreply.github.com from 2015-09-01 until 2016-08-01
 STIC Investments:

developers_affiliations1.txt

@@ -2304,9 +2304,10 @@ Avatat: bartosz!zieba.pro
 	Oktawave from 2019-06-01
 AvengerMoJo: AvengerMoJo!users.noreply.github.com, alau!suse.com
 	SUSE LLC
-AverageMarcus: AverageMarcus!users.noreply.github.com
+AverageMarcus: AverageMarcus!users.noreply.github.com, marcus!giantswarm.io
 	STFC until 2016-02-01
-	Elsevier Limited from 2016-02-01
+	Elsevier Limited from 2016-02-01 until 2021-09-10
+	Giant Swarm GmbH from 2021-09-10
 AviKndr: AviKndr!users.noreply.github.com
 	Graphic until 2015-09-01
 	Independent from 2015-09-01 until 2015-12-01

src/cncf-config/email-map

@@ -2309,6 +2309,9 @@ Atyansh!users.noreply.github.com Facebook Inc.
 AudriusButkevicius!users.noreply.github.com G-Research
 AurelioDeRosa!users.noreply.github.com Facebook Inc.
 AvengerMoJo!users.noreply.github.com SUSE LLC
+AverageMarcus!users.noreply.github.com Elsevier Limited < 2021-09-10
+AverageMarcus!users.noreply.github.com Giant Swarm GmbH
+AverageMarcus!users.noreply.github.com STFC < 2016-02-01
 Aweary!users.noreply.github.com Facebook Inc.
 BCMoon!users.noreply.github.com Samsung SDS
 BDiehr!users.noreply.github.com Amazon
@@ -15867,8 +15870,6 @@ avenkatesh!pivotal.io Independent < 2017-03-01
 avenkatesh!pivotal.io Pivotal
 avenkatesh!pivotal.io ThoughtWorks Inc < 2015-07-01
 average-bit!users.noreply.github.com NotFound
-averagemarcus!users.noreply.github.com Elsevier Limited
-averagemarcus!users.noreply.github.com STFC < 2016-02-01
 averri!users.noreply.github.com Ericsson < 2020-12-01
 averri!users.noreply.github.com Hamilton Company
 averri!users.noreply.github.com Sixbell Nekotec Solutions < 2015-05-01
@@ -72775,6 +72776,9 @@ marcus!aptira.com Aptira
 marcus!aptira.com Independent < 2015-02-27
 marcus!docker.com Docker Inc.
 marcus!dottodotdesign.co.uk Dot to Dot Design
+marcus!giantswarm.io Elsevier Limited < 2021-09-10
+marcus!giantswarm.io Giant Swarm GmbH
+marcus!giantswarm.io STFC < 2016-02-01
 marcus!glasnostic.com 1Kosmos Inc. < 2018-04-01
 marcus!glasnostic.com Glasnostic Inc
 marcus!hirt.se Datadog Inc