Refactor
Merge branch 'master' into kc-api-dry
Merge pull request #2383 from guardian/kc-api-dry

Commercial: Refactor ad-feed reading to avoid code replication