[#7272] combine oauth1 and oauth2 settings onto existing page, improve tests
8 files changed