Changes the id for the edit / delete user modal to use the name instead of the id.
Merge branch '2.1' into qa