Modify unit test to allow cli to merge

This is related to https://review.openstack.org/#/c/43810/

Change-Id: I603fa915689d6c23f04494c6672285440c80ee24
Fixes: bug #1216135
Merge "Modify unit test to allow cli to merge"