added tests for bug: osng-228 and osng-229, also for osng-138
Merge remote-tracking branch 'origin/bugfix-osng-228-229' into bugfix-osng-228-229

Conflicts:
	src/test/resources/database_seed.xml