Merge proposals dependent on lp:~openerp-dev/openerp-india/payroll-india-l10n_in_hr_payroll-migrate-with-6.1-kbh

1. payroll-india-l10n_in_hr_payroll-migrate-with-6.1-kbh
2. Dependent merge proposals