[#1114] Do not reuse the variable name as it leaks
Merge branch '1114-fix-delete-vocab-tag'
Merge branch 'master' of github.com:okfn/ckan