-- 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
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
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
CRM-13383 fix

----------------------------------------
* CRM-13383: Add Bounce Type option in Advance Search/Mailing section
  http://issues.civicrm.org/jira/browse/CRM-13383
CRM-13407 - Conditionally add HTML markup for HEAD and TITLE if not present, using mailing subject

----------------------------------------
* CRM-13407: View CiviMail Mailings - page should include an HTML title if one isn't provided in the message body
  http://issues.civicrm.org/jira/browse/CRM-13407
Merge pull request #1639 from eileenmcnaughton/master

test fixes (api tests) - one real fix (getfields action alias) & one in test class only
Merge pull request #1646 from monishdeb/CRM-13383

CRM-13383 fix
Webtest fixes - Related to Search Builder
Merge pull request #1654 from monishdeb/WebTestFixes

Webtest fixes - Related to Search Builder
CRM-13364 - Date fields in all popups should display calendar icon

----------------------------------------
* CRM-13364: Date fields in all popups should display calendar icon
  http://issues.civicrm.org/jira/browse/CRM-13364
CRM-13404
Merge pull request #1656 from yashodha/CRM-13404

CRM-13404
CRM-13328, fixes

----------------------------------------
* CRM-13328: Add support for image scaling
  http://issues.civicrm.org/jira/browse/CRM-13328
Merge pull request #1657 from kurund/CRM-13328

CRM-13328, fixes
CRM-13327, added new format

----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
  http://issues.civicrm.org/jira/browse/CRM-13327
Merge pull request #1658 from kurund/CRM-13327

CRM-13327, added new format