Merge branch 'master' into 14565-admin-managing-user

refs #14565

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --cc src/views/workbench/workbench.tsx
index 6c7c24386205310611b65b3df22029911c8602c0,90b2dad0197215578d8020b1da153d7d38c9e88e..cca374d6738e9645f5183871252a20d66311a979
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -232,7 -231,6 +234,7 @@@ export const WorkbenchPanel 
              <UpdateProcessDialog />
              <UpdateProjectDialog />
              <UserAttributesDialog />
 +            <UserManageDialog />
              <VirtualMachineAttributesDialog />
          </Grid>
-     );
+     );