"561698 -  Merge 'org.eclipse.mdm.nucleus/mkoller/contrib' into 'mkoller/contrib'"

Signed-off-by: Simon Skoczylas <simon.skoczylas@karakun.com>