TRUNK-4246: if/else/for/while/do statements should always use curly braces
Merge pull request #614 from dszafranek/TRUNK-4246

TRUNK-4246: if/else/for/while/do statements should always use curly braces