CRM-10225 fix - New Price Set Error

http://issues.civicrm.org/jira/browse/CRM-10225
-- CRM-13617 Webtest modification

----------------------------------------
* CRM-13617: Link Country and state province widget for custom data
  http://issues.civicrm.org/jira/browse/CRM-13617
Merge pull request #1972 from NileemaJadhav/CRM-13617webtest

-- CRM-13617 Webtest modification
Merge pull request #1931 from monishdeb/CRM-10225

CRM-10225 fix - New Price Set Error
CRM-10025:Price Set Error
CRM-10225 fix
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-10225