Merge branch 'master' of
https://code-repo.d4science.org/gCubeSystem/workspace-widget-portlet.git Conflicts: pom.xmlBug/21794 r4.21.0
commit
1004068c8f
https://code-repo.d4science.org/gCubeSystem/workspace-widget-portlet.git Conflicts: pom.xmlBug/21794 r4.21.0