Full fix for CRM-13293. Also includes query optimization in where() function.
Only throw error when employers are involved.
-- fixed for CRM-13340

----------------------------------------
* CRM-13340: upgrading to (unreleased) 4.3.6 gets sql error on some sites
  http://issues.civicrm.org/jira/browse/CRM-13340
CRM-13377 - Manipulate the main "Send Email" button but not the "Cancel" button

----------------------------------------
* CRM-13377: "Send email" produces double "Processing" button
  http://issues.civicrm.org/jira/browse/CRM-13377
CRM-13302
CRM-13302
Adding Contact Sort Name, Financial Type, Contribution ID and Status and Payment Instrument Order By's.  Adding Group and Tag filter. CRM-13384
CRM-13302
Merge pull request #1635 from deepak-srivastava/logs

CRM-13302 - improve detection of log columns that require rebuilding, and rebuilding mechanism
CRM-13302 - php 5.3 error fix
Merge pull request #1637 from deepak-srivastava/logs

CRM-13302 - php 5.3 error fix
CRM_Case_BAO_Case - Every call to Error::ignoreException should have matching call to Error::setCallback
CRM_Admin_Form_Setting_Smtp - Every call to Error::ignoreException should have matching call to Error::setCallback
test fix - EventTest fix getfields api_action alias (for rest)
test fix - for some reason JENKINs fails on these (although my local doesn't)
Revert "minor fix, CRM-12970"

This reverts commit a8ec0901625fd3c2d6c4199ab547af3420a82945.
Revert "fixes to setdefaults, CRM-12970"

This reverts commit 66094995512afa0a8c37f0a0b5304ce394ec6bb1.
--CRM-12970, fixed for more than one event discount set

----------------------------------------
* CRM-12970: civicrm_price_field_value not removed for discount price set
  http://issues.civicrm.org/jira/browse/CRM-12970
Mailing Labels - CRM-13396 - use addressee_display when possible when combining mailing addresses

----------------------------------------
* CRM-13396: Prefix missing in Mailing Labels when 'Merge labels for contacts with the same address' checked
  http://issues.civicrm.org/jira/browse/CRM-13396
CRM-13338 remove trailing whitespace introduced by previous commit on this issue

----------------------------------------
* CRM-13338: Profile field defaults not getting populated in contribution live page
  http://issues.civicrm.org/jira/browse/CRM-13338