Merge "dump_hals_for_release: account for numbers in file name"