Revert "CBLT-268:  product version now set to a token, instantiated at build time:"

This reverts commit ee5212dd5c79c0e40587a55659478d5eb621d01d.
Merge branch 'master' into stable