Merge branch 'master' into 'namespace'

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang

src/yang/etsi-nfv-vnf.yang

@@ -80,7 +80,8 @@ submodule etsi-nfv-vnf {
           "GS NFV-IFA011: Section 7.1.6.6,
            VirtualNetworkInterfaceRequirements information element";
       }
-      leaf niclo-requirements {
+
+      leaf nicio-requirements {
         type leafref {
           path "/nfv/vnfd/virtual-compute-descriptor/id";
         }