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

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