fixes #6936 permission admins to delete users
refs #6936 permissions/roles cleanup
refs #6109 simplify/reduce output to screen
fixes #6933 refine triggers for tbs with log/cache cols
refs #6933 dont run log cleanup during upgrade; we can run after the upgrade completes
refs #6933 rebuild triggers during upgrade
Merge branch 'dev' into test