Additional changes for travis test failure.
Merge branch 'master' of github.com:nuodb/migration-tools

Conflicts:
	core/src/test/java/com/nuodb/migrator/integration/mysql/StructureTest.java