Revert "Include version codename in the generated version string."
Revert "Include version codename in the generated version string."

This reverts commit 98b52748f863e2305886ee4480f58bdef3015d3a.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt