Merge "Add support for generic vnf to cloud region"