Disabled cluster discovery
Merge branch 'cloud-config-fix'

Conflicts:
	scripts/dev-config/cloud-config.yaml