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

Ticket: https://issues.openmrs.org/browse/GCI-9