am cdb6b46b: organize scripts with per-version sections to avoid merge conflicts

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