Gittrac #3532:  We now correctly report just the "main" part of the
HTCondor version; various other minor cleanups.