added regression test for bug OSNG-141, changed the xml database import to fit the database schema changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml