Tony's changes

git-svn-id: https://source.test-smoke.org/svn/branches/tux-devel@1379 f9e6db9c-56bf-0310-a82a-abbfb51efdf0
Deal with space inside the set of dots

git-svn-id: https://source.test-smoke.org/svn/branches/tux-devel@1380 f9e6db9c-56bf-0310-a82a-abbfb51efdf0
Be defensive for versions that might not be present during testing

git-svn-id: https://source.test-smoke.org/svn/branches/tux-devel@1381 f9e6db9c-56bf-0310-a82a-abbfb51efdf0