Change descriptor names

Mark Beierlrequested to merge
beierlm-master-patch-30218 into master

Updates the VNF and NS ids so they are unique to this package

Merge request reports