BS-7118, workservice is moved at tenant level - merge fix