Gateway-3283:Fix Properties files to resolve classloader issues