Merge "Add support for enum & expand vnf_catalogue schema"