chore(oas): [13/n] improve oas schemas (#9201) #2

Job	Run time
setup	5m 40s
Shard (0) Module Integration Tests	12m 14s
Shard (0) Unit Tests	11m 3s
Shard (1) Module Integration Tests	11m 17s
integration-tests-packages	17m 4s
Shard (1) Unit Tests	9m 15s
Shard (0) HTTP Integration Tests	12m 51s
Shard (1) HTTP Integration Tests	10m 43s
unit-tests	1s
integration-tests-modules	1s
integration-tests-http	1s
	1h 30m 10s

Provide feedback