Bug 1707: Changed data updates to use merge
Now these data store updates use merge api. Also changed the
instance identifier to use augmentation so that data base can
mange it efficiently.

Change-Id: I2d05f0bd04f1b6f39a7a24dee52568ac4f26c88b
Signed-off-by: Amit Mandke <ammandke@cisco.com>