Merge "Update to latest springboot versions"