rebase hell -- fixing issue in SSO_admin commit not being applied