Merge pull request #18538 from eileenmcnaughton/name

[REF] Remove checks as to whether entityShortName is in the component  array

diff --cc CRM/Export/Form/Select.php
Simple merge