Changed template to make migration to v2 easier#365

sfeatherstone wants to merge 2 commits intobadoo:masterbadoo/RIBs:masterfrom

sfeatherstone:change_templates_for_v2sfeatherstone/RIBs:change_templates_for_v2Copy head branch name to clipboard