scripts/config: merge fixes for various issues, including recursive dependency detect...