NXP-10119: new operation for generating conflicted item names
NXP-10119: add test for conflict name generation
NXP-10119: client size operation for asking conflicted item name
NXP-10119: writing integration test for the conflict detection and handling
NXP-10119: implement a test basic conflict resolution
Merge branch 'master' into 5.6.0