WIP: add upgrade step to rename client to org_unit
WIP fix setup wizard