Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-hr-leave-count-correct-dka

1. trunk-hr-leave-count-correct-dka
2. Dependent merge proposals