Merge pull request #2548 from kbrunham-intel/fix/2547

Fix formatter non-convergence for multi-line macro sums