Several fixes in the configuration and update of some example config fil...

...es. Identical to PR #5740 in 72x.