[FIX] project_mrp: fixed with in which product attributes are added, probably due to product and template refactoring
Merge branch 'master' of https://github.com/odoo/odoo into master-linux64