Merge "Update spring boot to 2.2"