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