Fix merge process for employees

- Set to inactive the EmployeeRoleHistory data of merged employees. Keeping
  only one active role.
- When fetch a person combobox, search for person without a merged_with_id.

Change-Id: I7ea6bde215019487aea3bfb5a297a4c2d75ce546