Merge "Set docker version to be from version properties"