Merge pull request #4111 from guardian/fronts-respect-grouping-news-take3

Facia: new template logic
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux