As discussed on HipChat, the least disruptive change, especially considering we want to backport this to 5.1 is definitely adding PrivilegedAction. This obviously avoids introducing any regression concerns in the 5.1 branch and work on a much cleaner approach moving forward. So I'll submit my PR that introduces these privileged actions for master and if that seems acceptable, we'll integrate that and then cherry-pick it back to 5.1.

I've added HHH-11620 Open as a follow-up for the long-term solution.