Merge branch '2.1.x'

Closes gh-18608

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql

 CREATE TABLE SPAM (
   id         INTEGER IDENTITY PRIMARY KEY,
-  name VARCHAR(30),
+  name VARCHAR(30)
 );

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-schema.sql

 CREATE TABLE BAR (
   id         INTEGER PRIMARY KEY,
-  name VARCHAR(30),
+  name VARCHAR(30)
 );

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/lexical-schema-aaa.sql

 CREATE TABLE FOO (
   id         INTEGER IDENTITY PRIMARY KEY,
-  todrop VARCHAR(30),
+  todrop VARCHAR(30)
 );

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql

 CREATE TABLE FOO (
   id         INTEGER IDENTITY PRIMARY KEY,
-  name VARCHAR(30),
+  name VARCHAR(30)
 );

spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql

 CREATE TABLE BAR (
   id         INTEGER IDENTITY PRIMARY KEY,
-  name VARCHAR(30),
+  name VARCHAR(30)
 );

spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql

 CREATE TABLE FOO (
   id         INTEGER IDENTITY PRIMARY KEY,
-  name VARCHAR(30),
+  name VARCHAR(30)
 );