Merge "Allow mvn-version to be overrided in distro-check"