BZ-1073993 - Incorrect NULL handling in JaxbOrganizationalEntity static methods
(cherry picked from commit d446a20b08907d060ac0617b81debe640031d785)