Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39

Conflicts:
	CRM/Contribute/Form/Search.php
	CRM/Core/Lock.php

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

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

diff --cc CRM/Contribute/Form/Search.php
index 21d9a62046f0d91d4baedcd620dd3170645073d0,9e224d1e5909df066354beb656a094c4d3dd757e..bd5d539443641ddc5ec5aae42c0ebf5cdb697f7b
--- 1/CRM/Contribute/Form/Search.php
--- 2/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@@ -263,8 -263,7 +263,9 @@@ class CRM_Contribute_Form_Search extend
          'contribution_status_id',
          'contribution_source',
          'contribution_trxn_id',
 +        'contribution_page_id',
 +        'contribution_product_id',
+         'invoice_id',
        );
        foreach ($specialParams as $element) {
          $value = CRM_Utils_Array::value($element, $this->_formValues);

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

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

diff --cc CRM/Utils/System.php
Simple merge

diff --cc bin/ContributionProcessor.php
Simple merge

diff --cc bin/deprecated/EmailProcessor.php
Simple merge

diff --cc js/Common.js
Simple merge

diff --cc templates/CRM/Contribute/Form/Search/Common.tpl
Simple merge

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

diff --cc tests/phpunit/WebTest/Campaign/ActivityTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Contact/AdvancedSearchTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Event/AddParticipationTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Event/AddPricesetTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Report/LoggingReportTest.php
Simple merge

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