Merge "Final fixes on UserManager.getUsers() refactoring."