improved user creation and editing workflow

refs #4929
Merge branch 'master' of git.artefactual.com:archivematica