Merge "Fixed a typo in UserController.java Test: no test needed as this is just a typo fix in documentation"