Merge pull request #16556 from bradcray/remove-pre-release-labels
Remove pre-release labels from version numbers
[reviewed by @mppf and @jhoole]
This is based on PR #15372.
Note that this process has changed / been simplified a bit since last
time due to the changes that were made during the introduction of