Merge pull request #7 from pradpnayak/UCCPAR-353

-- more work on UCCPAR-353
-- worked on UCCPAR-402
Merge pull request #8 from pradpnayak/UCCPAR-402

-- worked on UCCPAR-402
-- worked on UCCPAR-353
-- minor changes for UCCPAR-353
Merge pull request #9 from pradpnayak/UCCPAR-402

Uccpar 402
-- minor changes for duplicate dupal users for UCCPAR-353
-- minor fix for UCCPAR-353