Fixed issues due to duplicate payment profile and address #5777
Merge pull request #15 from tarunbhardwaj/develop

Fixed issues due to duplicate payment profile and address #5777