Simplify the templates to work with the new blocks in 864 from ckan core
Merge remote-tracking branch 'origin/for-after-ckan-864-is-merged'