US13377 #13420. Changed package to net.kaleidos.komumuno. Service and test, not working yet
Merge remote-tracking branch 'origin/develop' into develop