[MERGE] base: rename zipfile variable into zip_content (because zipname is an imported  module).
[MERGE] base: rename zipfile variable into zip_content (because zipname is an imported  module).
gisce/openobject-server,MarkusTeufelberger/openobject-server,vnc-biz/openerp-server,ovnicraft/openerp-server,gisce/openobject-server,ovnicraft/openerp-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,splbio/openobject-server,vnc-biz/openerp-server,splbio/openobject-server