Merge pull request #4898 from monishdeb/CRM-15619-fix

Crm 15619 fix

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

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

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

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

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

diff --cc CRM/Event/BAO/Participant.php
Simple merge

diff --cc api/v3/ReportTemplate.php
Simple merge

diff --cc api/v3/utils.php
Simple merge

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