Merge "Fix feature install for vnfapi"