Merge change 4720 into donut

* changes:
  Fix string formatters in SettingsProvider SecurityException message.