Merge pull request #606 from dszafranek/TRUNK-4246

TRUNK-4246: if/else/for/while/do statements should always use curly braces
Follow up fix for: Performance - Method concatenates strings using + in
a loop - TRUNK-4226
TRUNK-4246: if/else/for/while/do statements should always use curly braces