Edited Task: Merge ConventionsConfiguration Add methods [1250]

The model conventions will be applied for both C and S spaces, it will be up to the implementation to do the filtering.

Also expose the data space on EdmModel.