Merge pull request #4074 from shykes/separate-version

Move docker version introspection to a sub-package.