Merge branch 'master' into 'bug#89'
# Conflicts: # example-data/nfv.xml # src/yang/etsi-nfv-common.yang # src/yang/etsi-nfv-ns.yang # src/yang/etsi-nfv-vnf.yang
# Conflicts: # example-data/nfv.xml # src/yang/etsi-nfv-common.yang # src/yang/etsi-nfv-ns.yang # src/yang/etsi-nfv-vnf.yang