Merge changes I1740dcdc,I12f965b5

* changes:
  Parse <overlay> and abstract resource mapping
  Improve idmap2 xml parsing