Merge branch 'DEVELOP_BE_FLYWAY' of ssh://git.eclipse.org:29418/elogbook/elogbook into DEVELOP_BE_FLYWAY