Merge branch 'master' into boatclass-aliases

java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java

@@ -298,6 +298,7 @@ public class MasterDataImportTest {
             inputStream = new ByteArrayInputStream(os.toByteArray());
             MasterDataImporter importer = new MasterDataImporter(domainFactory, destService);
             importer.importFromStream(inputStream, randomUUID, false);
+            db.getLastError(); // make sure the write has finished before reads are used
         } finally {
             os.close();
             inputStream.close();