CRM-14696

Improve sold out display for price set options
CRM-14696 - Fix translate string
basic test tidy up
CRM-15550 adding a test shows only one instance of checking  has been updated
CRM-15550 add test to check for extraneous emails
remove redundant variables
Merge branch 'CRM-14696-v2' of https://github.com/JKingsnorth/civicrm-core into CRM-14696

Conflicts:
	CRM/Price/BAO/PriceField.php

----------------------------------------
* CRM-14696: Improve display for sold out price set options
  https://issues.civicrm.org/jira/browse/CRM-14696
fix for issue CRM-15702 sending bulk smses to contacts without e-mail address
CRM-15550 - Fix relationship id passed to postprocess hook
Merge pull request #4695 from colemanw/CRM-15550

CRM-15550 - Fix relationship id passed to postprocess hook
CRM-15711 - Improve efficiency of deleting a contact
CRM-15709 fix - Searchbuilder contactsubtype ≠ 'value' fails

https://issues.civicrm.org/jira/browse/CRM-15709
QA fixes
Webtest Fix
Merge pull request #4701 from rohankatkar/Tests

Webtest Fixes
CRM-13611 - Fix create/copy report form errors
CRM-15495 - Fix CRM.utils.renderOptions to handle optgroups correctly
CRM.utils.renderOptions - make escapeHtml optional
Report tpl whitespace cleanup
Remove unused legacy report list