Merge pull request #15986 from civicrm/5.20

5.20

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

diff --cc CRM/Activity/BAO/Query.php
Simple merge

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Core/DAO.php
Simple merge

diff --cc tests/phpunit/CRM/Activity/Selector/SearchTest.php
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge