Merge proposals dependent on lp://qastaging/~vauxoo/addons-vauxoo/6.1_account_analytic_account_better_syntax-dev_luis

1. 6.1_account_analytic_account_better_syntax-dev_luis
2. Dependent merge proposals