Merge changes from topic "cmd_user_refactoring" into tm-dev

* changes:
  Improvements on UserManagerService ShellCommand implementation (3/4).
  Improvements on UserManagerService ShellCommand implementation (2/4).