issue #20416: Fix problem where lingering privilege assigments for deprecated privileges were causing problems
issue #20416: Rename file.
issue #20416: Fix orm privileges and remove MaintainExtension from script.
issue #20416: No need for this priv now.
Resolve conflict
Merge pull request #420 from jrogelstad/20416

issue #20416: Fix so user account can save again.