model elements

When elementId != null, produce <elementId>=<generated-to-string> where
generated-to-string has redundant "elementId: <element-id>, " removed.

Change-Id: I7c0b5b8275d8f35454f8b0d58730b8b0607230ca
Signed-off-by: Ed Merks <ed.merks@gmail.com>