SonarQube - Major - if/else/for/while/do statements should always use curly braces

There is a need to fix Sonar issues.
Rule name for this ticket is "if/else/for/while/do statements should always use curly braces"
Link to Sonar issues site:
https://ci-stg.openmrs.org/sonar/drilldown/issues/1?severity=MAJOR