Cleared Sonar Major findings for missing curly braces.
Merge pull request #1098 from rackerlabs/WDS_SonarMajorMissingCurly

Cleared Sonar Major findings for missing curly braces.