am 2a544301: am 5cd7e86d: organize scripts with per-version sections to avoid merge conflicts

* commit '2a544301a2454b7c5a18e8028430a6b13ded0d89':
  organize scripts with per-version sections to avoid merge conflicts