Merge fix for TRQ-1318: pbs_server --version should show the matching git version.