Merge "Add an additional check for ICU4J tz data version"