CM marshaling bug: CM diagram can be saved without id

1. create a CM diagram
2. make valid modifications to the diagram with assigning an id to it
3. save the diagram

Issue: the diagram is saved with a client error; when loading the diagram from server, there is diagram parsing exception
Expected: the diagram should be validated before saving