Merge "BUG-7183: do not hard-code scala version"