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

I fixed merge errors.