dev/core#677 EntityRef filters fixes

[colemanw]

Overview

Fixes two bugs in EntityRef widget filters (e.g. the "Refine Search..." area when entering a contact on a form).

Before

1. Contact Type filter was broken for contactRef fields that already had a contact type specified (e.g. Current Employer field is set to contact type Organization)
2. Filters specific to Individuals were showing even when a different contact type was specified (e.g. Current Employer field allowed to filter by Deceased and Gender - which are irrelevant to Organizations).

After

1. Fixed.
2. Fixed.

See https://lab.civicrm.org/dev/core/issues/677

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[colemanw]

@civicrm-builder retest this please

[pradpnayak]

Thanks @colemanw for the fix, I did QA on current state of code, the gender id and deceased are now only available on individual search

Before:

After:

[colemanw]

Merging based on review.