Merge branch '1.4.x' into 1.5.x

Author: wilkinsona

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

@@ -116,17 +116,17 @@ public SpringLiquibase liquibase() {
 
 		private SpringLiquibase createSpringLiquibase() {
 			SpringLiquibase liquibase;
-			DataSource dataSource = getDataSource();
-			if (dataSource == null) {
-				dataSource = DataSourceBuilder.create().url(this.properties.getUrl())
+			DataSource dataSourceToUse = getDataSource();
+			if (dataSourceToUse == null) {
+				dataSourceToUse = DataSourceBuilder.create().url(this.properties.getUrl())
 						.username(this.properties.getUser())
 						.password(this.properties.getPassword()).build();
 				liquibase = new DataSourceClosingSpringLiquibase();
 			}
 			else {
 				liquibase = new SpringLiquibase();
 			}
-			liquibase.setDataSource(dataSource);
+			liquibase.setDataSource(dataSourceToUse);
 			return liquibase;
 		}