Merge "Upgrade to springboot 1.5.20.RELEASE"