Merge "Update apidoc to conform with vnf module"