Add additional checks for banned instances + various code improvements along the way #4681

Job	Run time
automated-tests	23m 50s
build	1m 8s
audit-check	33s
build-and-publish-docker-image	0s
fixer-dry-run	1m 2s
	26m 33s

Provide feedback