Merge pull request #12614 from nlebeck/settingshandler-edgecase Add SettingsHandler unit tests exercising the edge case fixed in PR #8704
