BS-7120, fix on tenant update with the same name
Merge branch 'BS-6674_TenantMaintMode' into BS-6674_TenantMaintMode_merge_master