Merge changes I12322a48,Ia1d062a1

* changes:
  Add post-processing logic for O-MR1 ld.config.txt
  Apply change in ETC file names to versioned names