Merge "Fixed sonar issues in ReloadConfigController class"