Full fix for CRM-13293. Also includes query optimization in where() function.
Only throw error when employers are involved.
towards CRM-10128
CRM-10128
Merge branch 'profile' of github.com:deepak-srivastava/civicrm-core into profile
CRM-10128, reverting first commit
CRM-10128
CRM-10128 - fix for anonymous user having same authSrc once set.
CRM-13302
CRM-13302
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
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