Merge "Adding user accessor functions to UserManagerHelper." into pi-dev