Adapt to changes in data-model-javascript 0.2.0

Change-Id: Ic431180db6cac0540242c24887487eab82367b26
Merge "Adapt to changes in data-model-javascript 0.2.0"