merge OSNG-198 development branch into fork master

Apparently the perform maven release in jenkins has trouble with navigating into the right branch, so we need to merge to master first (still staying in the fork).