Recognize existing indentation when indenting close braces

this PR addresses #8395 and is a 2nd attempt.  I refactored my fix based on feedback from @peterflynn and @redmunds in #8426
I think of it more as agile development: inspect and adapt. We can always update when we find a new annoyance :)