Fix for #3805 - wrap macro that starts with nested body blocks

[davidBar-On]

Fixes #3805

For wrapping macros with body block that starts with more than one {, i.e. starts with "nested blocks". The issue cause was that the nested block(s) { were not considered for calculating the remaining line width.

[ytmimi]

Thanks for your help on this! I left two minor comments inline. Let me know your thoughts on both points.

[davidBar-On]

Accepted the suggested changes, with minor change to the first comment. Note also my note about the formatted output of new nest case with multi {}.

[ytmimi]

Thanks for the help fixing this issue, and for applying the feedback. I think we're good to go here!

[calebcartwright]

I'm good with this change, but it will need to be version gated

@davidBar-On is that something you'd be willing to do when you have time?

[davidBar-On]

I'm good with this change, but it will need to be version gated

Added the version gating.
Also rebased and consolidated all changes into one commit.

Based on version other gating code, I used if context.config.version() == Version::Two, although I think that it may be better to use if context.config.version() != Version::One which is also good for Version::Three.

[ytmimi]

This one has been marked as ready-to-merge for a while, and the fix has been version gated. Everything continues to pass after rebasing so I think we're good to go here.