minor update for CUstomerServiceImpl and CustomerServiceTest
minor update for CUstomerServiceImpl and CustomerServiceTest
Merge origin/master