ACT-1890: Multi tenancy support: QA fix + deployment migration