Branch for the v21.07.0 release

CMB Release Processrequested to merge
bob.obara/smtk:update-to-v21.07.0 into release

Cc: @ben.boeckel @bob.obara @dcthomp @john.tourtellott

Fast-forward: true
Backport: master:HEAD~1

Edited by Ben Boeckel

Merge request reports