backport scripts/diffconfig.sh from trunk