Merge change 4694 into donut

* changes:
  Make SettingsProviders SecurityException messages more verbose.