Merge pull request #4960 from apache/fix-dev-run-setup-config-2

implement this same as maybe_boot_clouseau