BZ1008495 - Organizational Unit Manager: owner marked as mandatory but not needed
(cherry picked from commit 846e1f04da92677e03bc7acdea1facd0f7569586)