Merge pull request #968 from eileenmcnaughton/master

CRM-12768 caused locblock test to fail
Merge pull request #969 from eileenmcnaughton/master

CRM-12768 - custom api tweak on field spec
custom field api should default to 'is_active' = 1
Merge pull request #970 from eileenmcnaughton/apitweaks

custom field api should default to 'is_active' = 1
fix new regression - seems to relate to cached name clash
Merge branch 'master' of github.com:eileenmcnaughton/civicrm-core