Fixes #7111: Make the zanata settings consistent
Merge pull request #136 from bkearney/bkearney/7111

Fixes #7111: Make the zanata settings consistent