Most of the changes are related to import
import
we already changed like it in erp5.git master, it should be ok
erp5.git master
