Merge "Rebase: p/opnfv-fuel: Drop upstream patches."