Fixes: Merge issue when porting adding a new node
Fixes: Merge issue when porting adding a new node

Change-Id: Ia07bc151fe032cba49a5a65323c0237ccd0a1459
ClosesBug: 1471596

Juniper/contrail-fabric-utils,Juniper/contrail-fabric-utils