OOIION-1791 Fix resource schema in DSA
Merge pull request #1916 from wfrench/dsa_schema_fix

OOIION-1791 Fix resource schema in DSA
Remove failing test from scaffold. No effect on system.
Merge pull request #1924 from edwardhunter/ehfix

Fix nightly.
patch to OOIION-1790 to redefine a TESTED_DOC that is a fresh copy of master, and update DSA tests to use it.
Merge pull request #1926 from unwin/main_TD

patch to OOIION-1790 to redefine a TESTED_DOC that is a fresh copy of ma...
Merge pull request #1923 from lukecampbell/addparam

CIDEVSTC-49 - New service method for adding a parameter to a data product
OOIION-1749 Ensure state object is flushed on publication
Updates ion-functions for pull requests 120-128
Merge pull request #1929 from wfrench/dsa_state_fix

OOIION-1749 Ensure state object is flushed on publication
Merge pull request #1932 from cwingard/ionfunc

CIDEVMI-1178 Updates ion-functions for pull requests 120-127
Bump iondef pointer to include vm capacity adjustment
Merge pull request #1938 from jamie-cyber1/bump_ionptr

Bump iondef pointer to include vm capacity adjustment
Introduces a Jinja2 template system for catalog
Progress for metadata support and testing