Add edit terms permission for overridden permissions and roles vsites.
Don't redeclare the edit terms but just add them to the allowed permissions.
Add 'delete term' permission.
Merge pull request #5723 from openscholar/5694

Add edit terms permission for overridden permissions and roles vsites.