Merge proposals dependent on lp:~therp-nl/openobject-extension/oerp6.1-stable_lp1071378_magento_category_export

1. oerp6.1-stable_lp1071378_magento_category_export
2. Dependent merge proposals