Merge "idmap2: add sections to 'idmap2 dump' output"