[FIX] *: align industry licenses with standard ones

[fw-bot]

Forward-Port-Of: #1387

[robodoo]

[fw-bot]

@vava-odoo cherrypicking of pull request #1387 failed.

stdout:

Auto-merging agriculture_shop/__manifest__.py
CONFLICT (content): Merge conflict in agriculture_shop/__manifest__.py
Auto-merging architects/__manifest__.py
CONFLICT (content): Merge conflict in architects/__manifest__.py
Auto-merging art_craft/__manifest__.py
CONFLICT (content): Merge conflict in art_craft/__manifest__.py
Auto-merging automobile/__manifest__.py
CONFLICT (content): Merge conflict in automobile/__manifest__.py
CONFLICT (modify/delete): bar_and_lounge/__manifest__.py deleted in 265da163ea3786d4ce4c38ab79c7cf8575979403 and modified in 424e3abe27b3c277bc406fefc760ede2f0c2c052.  Version 424e3abe27b3c277bc406fefc760ede2f0c2c052 of bar_and_lounge/__manifest__.py left in tree.
Auto-merging bike_leasing/__manifest__.py
CONFLICT (content): Merge conflict in bike_leasing/__manifest__.py
Auto-merging billboard_rental/__manifest__.py
CONFLICT (content): Merge conflict in billboard_rental/__manifest__.py
Auto-merging cake_shop/__manifest__.py
CONFLICT (content): Merge conflict in cake_shop/__manifest__.py
Auto-merging certification_organism/__manifest__.py
CONFLICT (content): Merge conflict in certification_organism/__manifest__.py
Auto-merging clothing_boutique/__manifest__.py
CONFLICT (content): Merge conflict in clothing_boutique/__manifest__.py
Auto-merging coal_petroleum/__manifest__.py
CONFLICT (content): Merge conflict in coal_petroleum/__manifest__.py
Auto-merging condominium/__manifest__.py
CONFLICT (content): Merge conflict in condominium/__manifest__.py
Auto-merging construction/__manifest__.py
CONFLICT (content): Merge conflict in construction/__manifest__.py
Auto-merging corporate_gifts/__manifest__.py
CONFLICT (content): Merge conflict in corporate_gifts/__manifest__.py
Auto-merging electronic_store/__manifest__.py
CONFLICT (content): Merge conflict in electronic_store/__manifest__.py
Auto-merging eyewear_shop/__manifest__.py
CONFLICT (content): Merge conflict in eyewear_shop/__manifest__.py
Auto-merging fitness/__manifest__.py
CONFLICT (content): Merge conflict in fitness/__manifest__.py
Auto-merging fmcg_store/__manifest__.py
CONFLICT (content): Merge conflict in fmcg_store/__manifest__.py
Auto-merging furniture_store/__manifest__.py
CONFLICT (content): Merge conflict in furniture_store/__manifest__.py
Auto-merging hair_salon/__manifest__.py
CONFLICT (content): Merge conflict in hair_salon/__manifest__.py
Auto-merging hardware_shop/__manifest__.py
CONFLICT (content): Merge conflict in hardware_shop/__manifest__.py
Auto-merging headhunter/__manifest__.py
CONFLICT (content): Merge conflict in headhunter/__manifest__.py
Auto-merging industry_lawyer/__manifest__.py
CONFLICT (content): Merge conflict in industry_lawyer/__manifest__.py
Auto-merging industry_real_estate/__manifest__.py
CONFLICT (content): Merge conflict in industry_real_estate/__manifest__.py
Auto-merging industry_restaurant/__manifest__.py
CONFLICT (content): Merge conflict in industry_restaurant/__manifest__.py
Auto-merging it_hardware/__manifest__.py
CONFLICT (content): Merge conflict in it_hardware/__manifest__.py
Auto-merging micro_brewery/__manifest__.py
CONFLICT (content): Merge conflict in micro_brewery/__manifest__.py
Auto-merging non_profit_organization/__manifest__.py
CONFLICT (content): Merge conflict in non_profit_organization/__manifest__.py
Auto-merging pharmacy_retail/__manifest__.py
CONFLICT (content): Merge conflict in pharmacy_retail/__manifest__.py
Auto-merging photography/__manifest__.py
CONFLICT (content): Merge conflict in photography/__manifest__.py
Auto-merging software_reseller/__manifest__.py
CONFLICT (content): Merge conflict in software_reseller/__manifest__.py
Auto-merging solar_installation/__manifest__.py
CONFLICT (content): Merge conflict in solar_installation/__manifest__.py
Auto-merging sports_club/__manifest__.py
Auto-merging surveyor/__manifest__.py
CONFLICT (content): Merge conflict in surveyor/__manifest__.py
Auto-merging tests/test_generic/tests/test_manifest.py
CONFLICT (content): Merge conflict in tests/test_generic/tests/test_manifest.py

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

[vava-odoo]

@robodoo r+

[robodoo]

@vava-odoo 'ci/industry' failed on this reviewed PR.

[vava-odoo]

@robodoo r+