am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"

* commit '7caa8f14a78d279e0392089dca2f54f27e7f5d15':
  Make 'idmap --scan' accept more than one input directory