Reverting etsi-nfv-vnf.yang to its original state.

Change-Id: I6ed8c9e95a385c7c7a4cc3fef3a889f41cf65aa1

Changes per comments received from Bruno.

Change-Id: I6ed8c9e95a385c7c7a4cc3fef3a889f41cf65aa1