Release 170 hotfix BAC-508

Merging rename user tool fix to production by community team request (approved by wade)