Improved sanitizing of configuration names.

Fixes #2542
Update integration specs.
Changelog entry for fixing #2542