Merge branch 'adjust-focused-goal' into 'master'

Normalize focused goal output

See merge request iris/stdpp!330

test-normalizer.sed

 # adjust for https://github.com/coq/coq/pull/13656
 s/subgoal/goal/g
+# merge with subsequent line for https://github.com/coq/coq/pull/14999
+/[0-9]* focused goals\?$/{N;s/\n */ /;}