Data model edits to align SCDL w/onm v0.3+ ...

... fixes test breaks in the onm generic data model declaration test suite.