Merge "Upgrade spring boot dependencies to 2.5.5"