Revert "Revert "Feature 10941: User Management Enhancements""

This reverts commit 5f311160.

Change-Id: I2250c1b52487f6de7d56014e3da29eb1f78ec166
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>