scripts/config: merge fixes for various issues, including recursive dependency detection/handling (patch by mbm)

SVN-Revision: 28658