Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ebean-api/pom.xml
#	ebean-api/src/main/java/io/ebean/config/dbplatform/db2/BaseDB2Platform.java
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations

ebean-test/testconfig/ebean-db2.properties

@@ -2,3 +2,4 @@ ebean.test.platform=db2
 ebean.test.dbName=unit
 ebean.test.dbPassword=unit
 datasource.default=db2-11
+ebean.db2-11.databasePlatformName=db2luw

ebean-test/testconfig/ebean-oracle.properties

@@ -1,3 +1,3 @@
 ebean.test.platform=oracle
-ebean.test.dbName=oracle
-datasource.default=oracle-docker
+ebean.test.dbName=test_eb
+datasource.default=oracle