case 2947 - Added hook_update_N to set up new voc + terms.
case 2947 - Reexported permissions to resolve conflict in features.
Merge branch 'case-2947' into develop