Gateway-3283:Fix Properties files to resolve classloader issues
Merge pull request #317 from alameluchidambaram/Gateway-3283

Gtaeway-3283:Fix Properties file having same names