Merge pull request #15784 from civicrm/5.20

5.20

diff --cc CRM/Contact/Form/Search/Advanced.php
Simple merge

diff --cc CRM/Contribute/Form/Search.php
Simple merge

diff --cc CRM/Core/Form/Search.php
Simple merge

diff --cc CRM/Mailing/BAO/Mailing.php
Simple merge

diff --cc tests/phpunit/CRM/Contact/BAO/SavedSearchTest.php
Simple merge

diff --cc tests/phpunit/api/v3/JobProcessMailingTest.php
Simple merge