Update overridden templates to match CKAN 2.0 latest

...2.0