Changes to UserServiceImpl.java and UserServiceTest.java for TRUNK-4114.
Removal of test code from previous commit.