v21.1.0
Merge pull request #68825 from phlogistonjohn/jjm-smb-ctl-tool-fe
container/build.sh: fix debug tag overwrite
container/make-manifest-list.py: handle "no tags for this version"