Improve version matching for HDP 2.1