Merge pull request #965 from eileenmcnaughton/CRM-12768

CRM/Core/BAO/CustomField.php

CRM/Core/Config/Variables.php

api/v3/CustomField.php

api/v3/examples/Contact/GetFieldsOptions.php

api/v3/examples/ContactGetoptions.php

api/v3/examples/CustomFieldDelete.php

api/v3/utils.php

.../CRM/Contact/Form/Search/Custom/GroupTestDataProvider.php

tests/phpunit/CRM/Contact/Form/Search/Custom/dataset.xml

tests/phpunit/CRM/Utils/Cache/SqlGroupTest.php

tests/phpunit/CiviTest/civicrm.settings.dist.php

tests/phpunit/WebTest/Profile/ProfileAddTest.php

tests/phpunit/api/v3/CustomFieldTest.php

tests/phpunit/api/v3/dataset/financial_types.xml

tests/phpunit/api/v3/dataset/financial_types_account.xml

tests/phpunit/api/v3/dataset/group_nesting.xml

tests/phpunit/api/v3/dataset/group_subscribers.xml

tests/phpunit/api/v3/dataset/option_value_activity.xml

...punit/api/v3/dataset/option_value_contribution_status.xml