Bug 843602 - Refactor OAuth Flow 2.0 components to enable other services...