Bug 15548: Move new patron related code to Patron*