Improve e2e test's handling of versions such that the correct client tools can
be used and awkward copying of directories in and out of place isn't
needed any more.