Merge "Spring boot, Kotlin version upgrades"