Merge "idmap2: add debug information to idmap file format"