Merge pull request #1633 from yashodha/CRM-13386

CRM-13386
Merge pull request #1634 from eileenmcnaughton/master

CRM-13234 api/v3/Profile fix tests & support lower case primary fields
Merge pull request #1636 from pratik-joshi/CRM-13380

CRM-13380 : fix status and date filters for mailing search pages
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
Merge pull request #1597 from lcdservices/CRM-13341

CRM-13341 add group_id clause to subscription confirm query
Tested the patch, works as expected.
CRM-13341 - Fix typos in subscribe message.

----------------------------------------
* CRM-13341: group subscription emails fail for multiple groups
  http://issues.civicrm.org/jira/browse/CRM-13341
CRM-13398 - Update markup in Block.tpl for profile pre and post field help to match the <div> layout used in Dynamic.tpl. Fixes alignment issues.

----------------------------------------
* CRM-13398: Profile pre and post field help markup in Block.tpl messes up page layout
  http://issues.civicrm.org/jira/browse/CRM-13398
CRM-13399 - Include Available status activities in Assigned Activities section of User Dashboard. This will be valuable for sites using CiviVolunteer.

----------------------------------------
* CRM-13399: User Dashboard Assigned Activities should also show activities with Available status
  http://issues.civicrm.org/jira/browse/CRM-13399
Merge pull request #1631 from josephlacey/bookkeeping-report-updates

Adding Contact Sort Name, Financial Type, Contribution ID and Status and...
Merge branch 'master' into profile
CRM-13383 fix

----------------------------------------
* CRM-13383: Add Bounce Type option in Advance Search/Mailing section
  http://issues.civicrm.org/jira/browse/CRM-13383
CRM-13365 - Removed the extra closing DIV

----------------------------------------
* CRM-13365: Popups should work in Internet Explorer
  http://issues.civicrm.org/jira/browse/CRM-13365
CRM-13402 error handling, prevent loop if mysql server has 'gone away'

----------------------------------------
* CRM-13402: Improve debug logging around server unavailble (ditch the loop), missing contributions, mail store problems
  http://issues.civicrm.org/jira/browse/CRM-13402
emailProcessor add details about the account that failed