7163726493
* OAuth: Make use of auto_assign_org_id setting
(cherry picked from commit 8d1bef3769)
* OAuth: Make use of auto_assign_org_id setting
(cherry picked from commit 8d1bef3769)