Merge "Revert "EFI: Move patches to Fuel@OPNFV, upstream prep""