Combine 2 fixes so that enough checks pass to be able to merge #11060

Job	Run time
awx_collection integration (a-h, ^[a-h])	16m 5s
awx-operator	12m 43s
awx_collection sanity (stable-2.17)	1m 28s
dev-env	12m 55s
awx_collection integration (i-p, ^[i-p])	18m 58s
api-test	17m 41s
awx_collection integration (r-z0-9, ^[r-z0-9])	19m 7s
api-migrations	14m 22s
api-lint	4m 59s
api-swagger	8m 46s
awx-collection	6m 10s
api-schema	12m 3s
combine awx_collection integration coverage	37s
	2h 25m 54s

Provide feedback