Merging of Subscription schemas

- Added new schema from DMI Plugin to NCMP
- Added new schema from NCMP to the clients
- Renamed existing schemas as per the conventions
- Removed the merge keyword from the schemas and naming. Still the
  package will have merge keyword which will eventually be removed when
  we remove the old code

Issue-ID: CPS-1905
Issue-ID: CPS-1906
Change-Id: I1f8c35e7f6baa25346d9527d58e20bba7f0dddeb
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
4 files changed