Velocity templates should be called for super-types: primary and mixin

Resolves: https://www.pivotaltracker.com/story/show/79207804