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
Merge pull request #3969 from colemanw/CRM-15191

CRM-15191 - Ensure the cache gets cleared after updating custom fields via api