Fix Flyway Core vs. Maven plug-in mess

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
Merge pull request #1077 from vorburger/FlywayCoreInsteadMaven

Fix Flyway Core vs. Maven plug-in mess