Merge proposals dependent on lp://staging/~pedro.baeza/openupgrade-addons/7.0-account_analytic_plans

1. 7.0-account_analytic_plans
2. Dependent merge proposals