am 41bf75c6: am 287cd2d1: am bac309ca: Merge "RRO: idmap: fix sorting of overlays.list"

* commit '41bf75c606fa19b473bc87145f766757525ae96c':
  RRO: idmap: fix sorting of overlays.list