Merge changes Iddfdf664,Ifd7f98a4

* changes:
  Generalize member-vnf-index as string in constituent-vnfd in NSD to allow symbolic names
  Feature 639: support of floating IPs