Fixes #7111: Make the zanata settings consistent