ACT-1939: Fixed inclusion of process variables and task-variables
ACT-1941: Removing UserEntity and GroupEntity from identity-service cmds