Bug 1604: Fixed incorrect check in Normalized Node Writer startOrderedMapNode

Check which was used in startOrderedMapNode was meant to be part
of startMapEntry. Check for startOrderedMapNode should be
same as for startMapEntry, only used builder should be different.

Change-Id: I0062f184cc33ee6d1fd6783933f1f4c845f1c4d4
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Bug 1572: Fixed duplicate and inconsistent allocation of Version

After switching from numeric version objects to non-numeric Version
modifications based on modifications was broken due to duplicate
allocation of versions - one when derived modification
was allocated and other one when modification was commited,
this make all writes effectivelly conflicting, since
same node was seen with two different versions.

Change-Id: I366f77a96b74db3aa13a2f374d9437e7cfeb2da5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>