Gateway-3404:Fix conflicting Spring jar and add Properties jar
Merge pull request #369 from alameluchidambaram/Gateway-3404

Gateway-3404:Fix conflicting Spring jar and add Properties jar