issue #20416: Fix problem where lingering privilege assigments for deprecated privileges were causing problems