Remove api-key param from capi queries
Fix merge conflict
Fix config style regression
Merge pull request #6962 from guardian/sanitise-capi-queries

Strip api-key param from capi queries