Removes \n or space when $context/$extra are empty#24759

kirkmadera wants to merge 2 commits intosymfony:3.3symfony/symfony:3.3from

kirkmadera:patch-2kirkmadera/symfony:patch-2Copy head branch name to clipboard