Split off the acceptor credentials issue into a separate ticket 5450.

The rest of this is finished, and can be pulled up to release branches.