Fix merge issue in Unit test class USerServiceTest and
UserRestServiceTest
update UserRestServiceIT