This change tweaks blank line removal regex to avoid removing
blank lines that could break git trailers.
Now we will only remove blank line before an empty variable
when it is also followed by a blank line or EOF.
That way we won't break formatting of the message.

Changelog: fixed