Adjust collection->template map
Merge pull request #2258 from guardian/container-reshuffle

Container shuffle