Update code related to User instead of Customer from Krupa.

Update code related to User instead of Customer from Krupa.
Merge remote-tracking branch 'origin/Kuldeep' into Tarun