Merge branch 'release/7.x-0.18' into develop
1026_branchShortName
Bugfix: get user id for borchk, when user id is not of type userId
Merge branch 'feature/1026_branchShortName' into develop
updated to version 7.x-0.19
Merge branch 'release/7.x-0.19'