[MERGE] yaml_import: fix usage of attribute 'id' in tag !delete
[MERGE] yaml_import: fix usage of attribute 'id' in tag !delete

ovnicraft/openerp-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,vnc-biz/openerp-server,MarkusTeufelberger/openobject-server,vnc-biz/openerp-server,ovnicraft/openerp-server,gisce/openobject-server,gisce/openobject-server,splbio/openobject-server,splbio/openobject-server