Raising if cleanup causes an overindent when code is not formatted

With the latest patch to ASTRewriteAnalyzer, one scenario of #3669 is still not behaving properly. While better, it is over-indenting the last brace of a block.

```
void test2(boolean a, boolean b) {
if (a) {
if (b) {
System.out.println("True"); //$NON-NLS-1$
}
}
}
```

becomes:

```
void test2(boolean a, boolean b) {
if (a && b) {
System.out.println("True"); //$NON-NLS-1$
}
}

```