gh-188: allow multiple EMPLOYEE_LEAVE_TYPE instaces with the same legacy code leave for different employee types
Merge remote-tracking branch 'origin/next' into next