Address review comments #981

Job	Run time
StaticAnalysis (17)	4m 48s
Clients / UT & CodeCov (11)	11m 26s
Clients / UT & CodeCov (8)	11m 29s
Clients / UT & CodeCov (17)	10m 36s
ValidateGradleWrapper	10s
Internal / UT & CodeCov (17)	7m 4s
Integrations / UT & CodeCov (11)	2m 10s
Controller / UT & CodeCov (11)	6m 24s
Integrations / UT & CodeCov (17)	1m 40s
Internal / UT & CodeCov (8)	7m 26s
Controller / UT & CodeCov (8)	6m 0s
Server / UT & CodeCov (11)	10m 0s
Internal / UT & CodeCov (11)	7m 58s
Controller / UT & CodeCov (17)	6m 26s
Router / UT & CodeCov (8)	4m 5s
Router / UT & CodeCov (17)	3m 54s
Server / UT & CodeCov (17)	9m 36s
Server / UT & CodeCov (8)	9m 9s
Router / UT & CodeCov (11)	4m 21s
Integrations / UT & CodeCov (8)	1m 57s
StaticAnalysisAndUnitTestsFailureAlert	0s
	2h 6m 39s

Provide feedback