Merge "Sonus SBC VNFD/NSD" into v1.1