SSDM-4722: Make schema more constrained (add not nulls), remove unneeded fromString method from enumerations SVN: 37739