Merge pull request #14698 from civicrm/5.15

5.15 to master

diff --cc CRM/Batch/Form/Entry.php
Simple merge

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

diff --cc CRM/Core/BAO/CustomField.php
Simple merge

diff --cc CRM/Core/BAO/FinancialTrxn.php
Simple merge

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

diff --cc tests/phpunit/CRM/Contribute/Form/SearchTest.php
Simple merge