Merge proposals dependent on lp://qastaging/~openobject-italia-core-devs/openobject-italia/7.0-spesometro-core-devs

1. 7.0-spesometro-core-devs
2. Dependent merge proposals