Merge "Expose extension point for generic OAuth providers" into stable-2.10