Code cleanup and fixes to import
This updates code (civix etc) to latest standards.
Also fixes the import to use API4 OptionValue.Create. API3 OptionValue.Create was creating Negócio Social
as ``Negocio Social` and then crashing because it was not detecting that it already existed in the database.