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