Merge proposals dependent on lp:~openerp-dev/openobject-addons/saas-3-hr-leave-count-correct-mba

1. saas-3-hr-leave-count-correct-mba
2. Dependent merge proposals