Synchronization issue during data updates with multiple cores

When creating a device in a multi-core system, that device can be modified by the different cores and updates are applied concurrently to the kv store.  To ensure that an update to a device does not overwrite changes made by another core, we need to synchronize the data as best we can by merging the latest updates with the current changes.

At the moment, there is some logic that attempts to perform this merge.  But there are still instances of data overwrites.  This results in devices not being fully preprovisioned while others are. 

This needs to be investigated...