BACKLOG-960 moved organization classes from sso descriptor to entity