Merge "Remove unneeded empty lines at begin of if/else/foreach body"