Minor cleanup for the run directives that unpack the tarball

Combine RUN directives into a single line, and unpack into a version-independent directory