Refs #6315 and #6936. Fixing version number assembly.