Branch for the v21.04.0 release

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

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

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

Merge request reports