Merge "Update/cleanup users in oss_team and k8s_apps_team"