Merge pull request #17874 from colemanw/checkPermShort

CRM/Contact/BAO/ContactType.php

CRM/Contact/BAO/SavedSearch.php

CRM/Contribute/BAO/ContributionRecur.php

CRM/Core/BAO/MessageTemplate.php

CRM/Dedupe/Merger.php

CRM/Upgrade/Incremental/php/FiveTwentyEight.php

CRM/Upgrade/Incremental/php/FiveTwentyOne.php

CRM/Utils/Check/Component.php

CRM/Utils/Migrate/Import.php

Civi/Api4/Action/Setting/AbstractSettingAction.php

Civi/Api4/Event/Subscriber/ActivityPreCreationSubscriber.php

...pi4/Event/Subscriber/OptionValuePreCreationSubscriber.php

Civi/Api4/Generic/Traits/DAOActionTrait.php

Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php

Civi/Api4/Service/Schema/SchemaMapBuilder.php

Civi/Api4/Service/Spec/SpecGatherer.php

ext/search/CRM/Search/Upgrader.php

ext/sequentialcreditnotes/sequentialcreditnotes.php

tests/phpunit/CRM/Contact/Form/Task/EmailCommonTest.php

tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php