ENGINE-732: Separate Users and Operators

Subtask ENGINE-750 is ready for review.
You mean remove TODO?