Merge pull request #2541 from kbrunham-intel/fix/2540 Fix formatter non-convergence with EOL comment before else if