Updating nml2 comp type definitions to use LEMS schema 0.7, allowing <ConditionalDerivedVariable>