Merge "Minor change so vpci in sample vnfd generated is between single quotes so it still works when the pci only contains numbers"
