Sort address tokens into an optgroup
CRM-15191 - Ensure the cache gets cleared after updating custom fields via api
CRM-15191 - Prevent blank token for disabled fields
Code cleanup
CRM-15121 - Fix searching for Permissioned Relationship property in Advanced Search.

----------------------------------------
* CRM-15121:
  https://issues.civicrm.org/jira/browse/CRM-15121
CRM-15121 - whitespace fix.

----------------------------------------
* CRM-15121:
  https://issues.civicrm.org/jira/browse/CRM-15121
CRM-15121 - whitespace fix.

----------------------------------------
* CRM-15121:
  https://issues.civicrm.org/jira/browse/CRM-15121
Merge pull request #3969 from colemanw/CRM-15191

CRM-15191 - Ensure the cache gets cleared after updating custom fields via api
Merge pull request #3971 from davecivicrm/CRM-15121

CRM-15121 - Fix searching for Permissioned Relationship property in Adva...
CRM-15197 - Fix for WebTest_Event_AddParticipationTest::testEventAddMultipleParticipants

----------------------------------------
* CRM-15197:
  https://issues.civicrm.org/jira/browse/CRM-15197
Merge pull request #3977 from davecivicrm/CRM-15197

CRM-15197 - Fix for WebTest_Event_AddParticipationTest::testEventAddMult...
Revert "CRM-14946 add relevant test data set"

After interviewing Eileen, Kurund, and Dave, it appears that 450a63c was a
draft that shouldn't have been merged.  The underlying question was how to
handle a change in the smart-group data-structure.  One approach (implicit
in 450a63c) was to maintain runtime compatibility.  Another approach (which
was ultimately chosen) was to define an upgrade that altered the
data-structure.

This fixes the failure in CRM_Contact_BAO_GroupTest::testGroupData.

This reverts commit 450a63cfc27064f2ffc141e76d4662fe612a67a5.
CRM_Core_BAO_SettingTest - Fix setting leakage which breaks CRM_Core_BAO_SettingTest

A previous commit fixed the leak out of CRM_Case_BAO_CaseTest, but there appears to be more.
This fix tries to be more aggressive about setting a general baseline.
CRM_Case_PseudoConstantTest - Fix

The old assertion was dependending on the previous test (e.g. the
list of case-types added/removed). By changing the base class
to CiviCaseTestCase, we get a more consistent (but different)
starting point.
Merge pull request #3978 from totten/4.5-revert-450a63

Revert "CRM-14946 add relevant test data set"
CRM_Core_ErrorTest - Fix local failiure (observed in OS X 10.7, MAMP 2.x)
HR-402: fix for notices on case status
Merge pull request #3980 from totten/4.5-component-tests

CRM_Core_BAO_SettingTest - Fix setting leakage which breaks CRM_Core_BAO_SettingTest
Merge pull request #3982 from yashodha/HR-402

HR-402: fix for notices on case status
Merge pull request #3981 from totten/4.5-log-error

CRM_Core_ErrorTest - Fix local failiure (observed in OS X 10.7, MAMP 2.x)