revise tagging for 5 problems and fix 1

See comments for individual commits for details.

I am unclear what led to the two "Merge branch 'master' ..." items, nor what action resulted.