Make sure that the properties are stored on updates

Previously properties_data was only stored on creation, now
this is getting passed to the update mechanism too.
Later we can look at reworking this into a single mechanism.

Closes-bug: #1377681
Change-Id: If3d476f34b9e61a3c99f63ba33734a875353c8fc
(cherry picked from commit d32370233eaf2a5c32888f269bd1dc5e0e787467)