A few lines of code were missed in the initial contribution, due to porting from guilin to master:

• isBase is not being set on delete flows, causing issues when deletion needs to be done in a certain order.
• A second AAI lookup is required for genericVnf in order to fetch modelCustomizationId, which is required for validations in Service-Macro-Upgrade.