Removed a layer of app manager template hierarchy #16263

Job	Run time
tests (python, 05)	18m 24s
tests (python, 6a)	15m 41s
tests (python, bf)	14m 12s
tests (python-sharded-and-javascript)	16m 57s
	1h 5m 14s

Provide feedback