[MERGE] addons: avoid noupdate mode being impacted by order of files in __openerp__.py
[MERGE] addons: avoid noupdate mode being impacted by order of files in __openerp__.py

akretion/openerp-server,akretion/openerp-server,akretion/openerp-server