[MRG] from upstream (lp:c2c-addons/6.1  rev 45.1.4)
[MRG] from upstream
(lp:c2c-addons/6.1  rev 45.1.4)

factorlibre/carrier-delivery,Endika/carrier-delivery,OCA/carrier-delivery,akretion/delivery-carrier,Antiun/carrier-delivery