Merge proposals dependent on lp:~openerp-dev/openerp-web/7.0-fix-push-state-chs

lp:~openerp-dev/openerp-web/7.0-fix-push-state-chs has no merge proposals.