Merge "Correct generic-vnf widget data-del-flag"