[UTC] Generalize version regex

The suffix for the git revision may not be present (or may not be
a git revision).